From d0ef4f15ce52bc536a660bd202b5b36495369b3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Ma=C5=82achowski?= Date: Mon, 30 Sep 2024 21:25:56 +0200 Subject: [PATCH] Fix shellcheck issues --- cmd/jobguard/run.sh | 0 images/e2e-dind-k3d/init.sh | 3 +++ images/e2e-dind-nodejs/init.sh | 3 +++ images/unified-agent/start-wssagent.sh | 5 ++++- 4 files changed, 10 insertions(+), 1 deletion(-) delete mode 100755 cmd/jobguard/run.sh diff --git a/cmd/jobguard/run.sh b/cmd/jobguard/run.sh deleted file mode 100755 index e69de29bb2d1..000000000000 diff --git a/images/e2e-dind-k3d/init.sh b/images/e2e-dind-k3d/init.sh index aeb34913e232..721581b9872d 100755 --- a/images/e2e-dind-k3d/init.sh +++ b/images/e2e-dind-k3d/init.sh @@ -1,4 +1,5 @@ #!/usr/bin/dumb-init /bin/bash +# shellcheck shell=bash set -e @@ -12,6 +13,8 @@ cleanup_dind() { fi } +# It's called using trap for INT TERM signal +# shellcheck disable=SC2317 early_exit_handler() { if [ -n "${WRAPPED_COMMAND_PID:-}" ]; then kill -TERM "$WRAPPED_COMMAND_PID" || true diff --git a/images/e2e-dind-nodejs/init.sh b/images/e2e-dind-nodejs/init.sh index f471b9dad625..3422bb35311b 100755 --- a/images/e2e-dind-nodejs/init.sh +++ b/images/e2e-dind-nodejs/init.sh @@ -1,4 +1,5 @@ #!/usr/local/bin/dumb-init /bin/bash +# shellcheck shell=bash set -e @@ -12,6 +13,8 @@ cleanup_dind() { fi } +# It's called using trap for INT TERM signal +# shellcheck disable=SC2317 early_exit_handler() { if [ -n "${WRAPPED_COMMAND_PID:-}" ]; then kill -TERM "$WRAPPED_COMMAND_PID" || true diff --git a/images/unified-agent/start-wssagent.sh b/images/unified-agent/start-wssagent.sh index a377670b8de6..93399b6687f4 100755 --- a/images/unified-agent/start-wssagent.sh +++ b/images/unified-agent/start-wssagent.sh @@ -20,7 +20,7 @@ GO_MOD_CONFIG_PATH="/wss/go-mod-wss-unified-agent.config" JAVASCRIPT_CONFIG_PATH="/wss/javascript-wss-unified-agent.config" PYTHON_CONFIG_PATH="/wss/python-wss-unified-agent.config" -if [[ ! -z "$INTERNAL_GITHUB_TOKEN" && ! -z "$INTERNAL_GITHUB_URL" ]]; then +if [[ -n "$INTERNAL_GITHUB_TOKEN" && -n "$INTERNAL_GITHUB_URL" ]]; then git config --global url."https://${INTERNAL_GITHUB_TOKEN}:x-oauth-basic@${INTERNAL_GITHUB_URL}/".insteadOf "https://${INTERNAL_GITHUB_URL}/" export GOPRIVATE=${INTERNAL_GITHUB_URL}/kyma fi @@ -99,6 +99,9 @@ function scanFolder() { # expects to get the fqdn of folder passed to scan export WS_EXCLUDES="${WS_EXCLUDES} ${CUSTOM_EXCLUDE}" fi + # WS_PRODUCTNAME is treat as a input + # it's set outside the script + # shellcheck disable=SC2153 echo "Product name - $WS_PRODUCTNAME" echo "Project name - $WS_PROJECTNAME"