Enable Shell-Check for circle CI scripts

ornladios · Dec 4, 2023 · 3518006 · 3518006
1 parent fab66d4
commit 3518006
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/.shellcheck_exclude_paths b/.shellcheck_exclude_paths
@@ -1,5 +1,3 @@
-scripts/ci/circle/postCDashStatus.sh
-scripts/ci/circle/run.sh
 scripts/ci/gh-actions/check-branch-name.sh
 scripts/ci/gh-actions/get-changed-files.sh
 scripts/ci/gh-actions/macos-setup.sh

diff --git a/scripts/ci/circle/postCDashStatus.sh b/scripts/ci/circle/postCDashStatus.sh
@@ -4,7 +4,7 @@ USER=${STATUS_ROBOT_NAME}
 TOKEN=${STATUS_ROBOT_KEY}
 COMMIT=${CIRCLE_SHA1}
 CDASH_STATUS_CONTEXT="cdash"
-SOURCE_DIR="$(readlink -f ${CIRCLE_WORKING_DIRECTORY}/source)"
+SOURCE_DIR="$(readlink -f "${CIRCLE_WORKING_DIRECTORY}"/source)"
 
 build_status_body() {
   cat <<EOF
@@ -18,8 +18,9 @@ EOF
 }
 
 PYTHON_SCRIPT="${SOURCE_DIR}/scripts/ci/findStatus.py"
-curl -u "${USER}:${TOKEN}" "${API_BASE}/commits/${COMMIT}/statuses" | python3 ${PYTHON_SCRIPT} --context ${CDASH_STATUS_CONTEXT}
-if [ $? -ne 0 ]
+curl -u "${USER}:${TOKEN}" "${API_BASE}/commits/${COMMIT}/statuses" | python3 "${PYTHON_SCRIPT}" --context ${CDASH_STATUS_CONTEXT}
+exit_status=$?
+if [ "$exit_status" -ne 0 ]
 then
   echo "Need to post a status for context ${CDASH_STATUS_CONTEXT}"
   postBody="$(build_status_body)"

diff --git a/scripts/ci/circle/run.sh b/scripts/ci/circle/run.sh
@@ -1,5 +1,6 @@
 #!/bin/bash --login
 
+# shellcheck source=/dev/null
 . /etc/profile.d/modules.sh
 
 # Parse the branch name used by the PR
@@ -8,8 +9,9 @@ REALBRANCH="${CIRCLE_BRANCH}"
 if [ -n "${CIRCLE_PR_NUMBER}" ]
 then
   APIURL="${API_BASE}/pulls/${CIRCLE_PR_NUMBER}"
-  RESULT="$(curl -s ${APIURL} | python3 -c "import sys, json; print(json.load(sys.stdin)['head']['ref'])" 2> /dev/null)"
-  if [ $? -eq 0 ]
+  RESULT="$(curl -s "${APIURL}" | python3 -c "import sys, json; print(json.load(sys.stdin)['head']['ref'])" 2> /dev/null)"
+  exit_status=$?
+  if [ "$exit_status" -eq 0 ]
   then
     REALBRANCH="$(echo "${RESULT}" | tr '/' '-')"
   fi
@@ -70,8 +72,9 @@ echo "**********Env End************"
 
 echo "**********CTest Begin**********"
 ${CTEST} --version
-echo ${CTEST} -VV -S ${CTEST_SCRIPT} -Ddashboard_full=OFF ${CTEST_STEP_ARGS}
-${CTEST} -VV -S ${CTEST_SCRIPT} -Ddashboard_full=OFF ${CTEST_STEP_ARGS}
+echo ${CTEST} -VV -S "${CTEST_SCRIPT}" -Ddashboard_full=OFF "${CTEST_STEP_ARGS}"
+# shellcheck disable=SC2086
+${CTEST} -VV -S "${CTEST_SCRIPT}" -Ddashboard_full=OFF ${CTEST_STEP_ARGS}
 RET=$?
 echo "**********CTest End************"