From e49073498973e18bcbe770ce7fa02a3e163c9f1e Mon Sep 17 00:00:00 2001 From: Mateusz Szostok Date: Tue, 8 Jun 2021 16:47:24 +0200 Subject: [PATCH] Fix shellcheck issues (#75) --- hack/compress.sh | 6 ++++-- hack/run-lint.sh | 13 +++++++++---- hack/run-test-integration.sh | 6 ++++-- hack/run-test-unit.sh | 7 +++++-- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/hack/compress.sh b/hack/compress.sh index 11898b4..e225e3b 100755 --- a/hack/compress.sh +++ b/hack/compress.sh @@ -6,8 +6,10 @@ set -o nounset # treat unset variables as an error and exit immediately. set -o errexit # exit immediately when a command fails. set -E # needs to be set if we want the ERR trap -readonly CURRENT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -readonly ROOT_PATH=$( cd "${CURRENT_DIR}/.." && pwd ) +CURRENT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) +ROOT_PATH=$( cd "${CURRENT_DIR}/.." && pwd ) +readonly CURRENT_DIR +readonly ROOT_PATH # shellcheck source=./hack/lib/utilities.sh source "${CURRENT_DIR}/lib/utilities.sh" || { echo 'Cannot load CI utilities.'; exit 1; } diff --git a/hack/run-lint.sh b/hack/run-lint.sh index f200098..699ebe7 100755 --- a/hack/run-lint.sh +++ b/hack/run-lint.sh @@ -5,10 +5,15 @@ set -o nounset # treat unset variables as an error and exit immediately. set -o errexit # exit immediately when a command fails. set -E # needs to be set if we want the ERR trap -readonly CURRENT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -readonly ROOT_PATH=$( cd "${CURRENT_DIR}/.." && pwd ) -readonly GOLANGCI_LINT_VERSION="v1.31.0" -readonly TMP_DIR=$(mktemp -d) +CURRENT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) +ROOT_PATH=$( cd "${CURRENT_DIR}/.." && pwd ) +GOLANGCI_LINT_VERSION="v1.31.0" +TMP_DIR=$(mktemp -d) + +readonly CURRENT_DIR +readonly GOLANGCI_LINT_VERSION +readonly ROOT_PATH +readonly TMP_DIR # shellcheck source=./hack/lib/utilities.sh source "${CURRENT_DIR}/lib/utilities.sh" || { echo 'Cannot load CI utilities.'; exit 1; } diff --git a/hack/run-test-integration.sh b/hack/run-test-integration.sh index 1e58065..c047eb8 100755 --- a/hack/run-test-integration.sh +++ b/hack/run-test-integration.sh @@ -5,8 +5,10 @@ set -o nounset # treat unset variables as an error and exit immediately. set -o errexit # exit immediately when a command fails. set -E # needs to be set if we want the ERR trap -readonly CURRENT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -readonly ROOT_PATH=$( cd "${CURRENT_DIR}/.." && pwd ) +CURRENT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) +ROOT_PATH=$( cd "${CURRENT_DIR}/.." && pwd ) +readonly CURRENT_DIR +readonly ROOT_PATH # shellcheck source=./hack/lib/utilities.sh source "${CURRENT_DIR}/lib/utilities.sh" || { echo 'Cannot load CI utilities.'; exit 1; } diff --git a/hack/run-test-unit.sh b/hack/run-test-unit.sh index 617b6f6..81319d5 100755 --- a/hack/run-test-unit.sh +++ b/hack/run-test-unit.sh @@ -5,8 +5,11 @@ set -o nounset # treat unset variables as an error and exit immediately. set -o errexit # exit immediately when a command fails. set -E # needs to be set if we want the ERR trap -readonly CURRENT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -readonly ROOT_PATH=$( cd "${CURRENT_DIR}/.." && pwd ) +CURRENT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) +ROOT_PATH=$( cd "${CURRENT_DIR}/.." && pwd ) + +readonly CURRENT_DIR +readonly ROOT_PATH # shellcheck source=./hack/lib/utilities.sh source "${CURRENT_DIR}/lib/utilities.sh" || { echo 'Cannot load CI utilities.'; exit 1; }