Fix shellcheck warnings

yxzhan · Oct 11, 2021 · 2d0f5ce · 2d0f5ce
1 parent 09ff16d
commit 2d0f5ce
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/ci/publish b/ci/publish
@@ -31,10 +31,14 @@ if [[ $GITHUB_REF != refs/tags/* ]]; then
     PR_OR_HASH=$(git log -1 --pretty=%h-%B | head -n1 | sed 's/^.*\(#[0-9]*\).*/\1/' | sed 's/^\([0-9a-f]*\)-.*/@\1/')
     LATEST_COMMIT_TITLE=$(git log -1 --pretty=%B | head -n1)
     EXTRA_MESSAGE="${GITHUB_REPOSITORY}${PR_OR_HASH} ${LATEST_COMMIT_TITLE}"
+
+    # shellcheck disable=SC2086
     chartpress $PUBLISH_ARGS --extra-message "${EXTRA_MESSAGE}"
 else
     # Setting a tag explicitly enforces a rebuild if this tag had already been
     # built and we wanted to override it.
+
+    # shellcheck disable=SC2086
     chartpress $PUBLISH_ARGS --tag "${GITHUB_REF:10}"
 fi
 

diff --git a/tools/templates/watch-diff.sh b/tools/templates/watch-diff.sh
@@ -17,10 +17,10 @@ rm -rf $TMP_DIFF_DIR
 mkdir $TMP_DIFF_DIR
 git init $TMP_DIFF_DIR
 
-helm template jupyterhub --values $HERE_DIR/lint-and-validate-values.yaml --output-dir $TMP_DIFF_DIR
+helm template jupyterhub --values "$HERE_DIR/lint-and-validate-values.yaml" --output-dir $TMP_DIFF_DIR
 
 # create a point of comparison
 (cd $TMP_DIFF_DIR && git add . && git commit -m "Comparision point")
 
 # watch "git diff" every second (-n1), in color (-c), without watch header (-t)
-watch -n1 -ct "helm template jupyterhub --values $HERE_DIR/lint-and-validate-values.yaml --output-dir $TMP_DIFF_DIR > /dev/null && (cd $TMP_DIFF_DIR && git diff --unified=1 --color=always)"
+watch -n1 -ct "helm template jupyterhub --values \"$HERE_DIR/lint-and-validate-values.yaml\" --output-dir $TMP_DIFF_DIR > /dev/null && (cd $TMP_DIFF_DIR && git diff --unified=1 --color=always)"