3.18 shellcheck fixes not brought due to diffs between master and 3.18

cfengine · Jan 10, 2024 · 989af27 · 989af27
1 parent 9709f55
commit 989af27
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/generator/build/main.sh b/generator/build/main.sh
@@ -46,9 +46,9 @@ function fetch_file() {
   fi
   local success=1                     # 1 means False in bash, 0 means True
   set +e
-  for i in `seq 1 $tries`; do
+  for i in $(seq 1 "$tries"); do
     wget "$target" -O "$destination" && success=0 && break
-    if [ $i -lt $tries ]; then
+    if [ "$i" -lt "$tries" ]; then
       sleep 10s
     fi
   done
@@ -118,4 +118,4 @@ export LC_ALL=C.UTF-8
 
 # finally, run actual jekyll
 echo "+ bash -x ./_scripts/_run_jekyll.sh $BRANCH || exit 6"
-bash -x ./_scripts/_run_jekyll.sh $BRANCH || exit 6
+bash -x ./_scripts/_run_jekyll.sh "$BRANCH" || exit 6
diff --git a/generator/build/run.sh b/generator/build/run.sh
@@ -20,8 +20,8 @@ true "${PACKAGE_JOB?undefined}"
 true "${PACKAGE_UPLOAD_DIRECTORY?undefined}"
 true "${PACKAGE_BUILD?undefined}"
 
-c=$(buildah from -v $PWD:/nt docs22)
-trap "buildah run $c bash -c 'sudo chown -R root:root /nt; sudo chmod -R a+rwX /nt'; buildah rm $c >/dev/null" EXIT
-buildah run $c bash -x documentation/generator/build/main.sh $BRANCH $PACKAGE_JOB $PACKAGE_UPLOAD_DIRECTORY $PACKAGE_BUILD
-buildah run $c bash -x documentation/generator/_scripts/_publish.sh $BRANCH
+c=$(buildah from -v "$PWD":/nt docs22)
+trap 'buildah run "$c" bash -c "sudo chown -R root:root /nt; sudo chmod -R a+rwX /nt"; buildah rm "$c" >/dev/null' EXIT
+buildah run "$c" bash -x documentation/generator/build/main.sh "$BRANCH" "$PACKAGE_JOB" "$PACKAGE_UPLOAD_DIRECTORY" "$PACKAGE_BUILD"
+buildah run "$c" bash -x documentation/generator/_scripts/_publish.sh "$BRANCH"