From 7929175db642f6fd3f8df6daf067c6480a070c6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= Date: Sat, 12 Dec 2020 01:46:21 +0100 Subject: [PATCH] Add shellcheck source directive in places where it can't find sourced files on its own --- .circleci/soltest.sh | 1 + scripts/docs_version_pragma_check.sh | 2 ++ scripts/tests.sh | 1 + test/cmdlineTests.sh | 2 ++ 4 files changed, 6 insertions(+) diff --git a/.circleci/soltest.sh b/.circleci/soltest.sh index ed6708d16..4f9bd8a81 100755 --- a/.circleci/soltest.sh +++ b/.circleci/soltest.sh @@ -41,6 +41,7 @@ REPODIR="$(realpath "$(dirname "$0")/..")" IFS=" " read -r -a BOOST_TEST_ARGS <<< "$BOOST_TEST_ARGS" IFS=" " read -r -a SOLTEST_FLAGS <<< "$SOLTEST_FLAGS" +# shellcheck source=scripts/common.sh source "${REPODIR}/scripts/common.sh" # Test result output directory (CircleCI is reading test results from here) mkdir -p test_results diff --git a/scripts/docs_version_pragma_check.sh b/scripts/docs_version_pragma_check.sh index 22b3ddb87..77aa4ee73 100755 --- a/scripts/docs_version_pragma_check.sh +++ b/scripts/docs_version_pragma_check.sh @@ -29,7 +29,9 @@ set -e REPO_ROOT=$(cd "$(dirname "$0")/.." && pwd) SOLIDITY_BUILD_DIR=${SOLIDITY_BUILD_DIR:-${REPO_ROOT}/build} +# shellcheck source=scripts/common.sh source "${REPO_ROOT}/scripts/common.sh" +# shellcheck source=scripts/common_cmdline.sh source "${REPO_ROOT}/scripts/common_cmdline.sh" developmentVersion=$("$REPO_ROOT/scripts/get_version.sh") diff --git a/scripts/tests.sh b/scripts/tests.sh index 56979de65..23879a497 100755 --- a/scripts/tests.sh +++ b/scripts/tests.sh @@ -32,6 +32,7 @@ REPO_ROOT="$(dirname "$0")/.." SOLIDITY_BUILD_DIR="${SOLIDITY_BUILD_DIR:-${REPO_ROOT}/build}" IFS=" " read -r -a SMT_FLAGS <<< "$SMT_FLAGS" +# shellcheck source=scripts/common.sh source "${REPO_ROOT}/scripts/common.sh" WORKDIR=$(mktemp -d) diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh index 56c453200..26230c965 100755 --- a/test/cmdlineTests.sh +++ b/test/cmdlineTests.sh @@ -32,7 +32,9 @@ set -e REPO_ROOT=$(cd "$(dirname "$0")/.." && pwd) SOLIDITY_BUILD_DIR=${SOLIDITY_BUILD_DIR:-${REPO_ROOT}/build} +# shellcheck source=scripts/common.sh source "${REPO_ROOT}/scripts/common.sh" +# shellcheck source=scripts/common_cmdline.sh source "${REPO_ROOT}/scripts/common_cmdline.sh" (( $# <= 1 )) || { printError "Too many arguments"; exit 1; }