test: Make more shell scripts verifiable by the shellcheck tool

hebasto · hebasto · commit c6f7b89405a4 · 2021-11-13T20:46:28.000+02:00
diff --git a/contrib/guix/guix-attest b/contrib/guix/guix-attest
@@ -6,7 +6,7 @@ set -e -o pipefail
 #   1. Checks if we're at the top directory of the Bitcoin Core repository
 #   2. Defines a few common functions and variables
 #
-# shellcheck source=libexec/prelude.bash
+# shellcheck source=contrib/guix/libexec/prelude.bash
 source "$(dirname "${BASH_SOURCE[0]}")/libexec/prelude.bash"
 
 
diff --git a/contrib/guix/guix-build b/contrib/guix/guix-build
@@ -6,7 +6,7 @@ set -e -o pipefail
 #   1. Checks if we're at the top directory of the Bitcoin Core repository
 #   2. Defines a few common functions and variables
 #
-# shellcheck source=libexec/prelude.bash
+# shellcheck source=contrib/guix/libexec/prelude.bash
 source "$(dirname "${BASH_SOURCE[0]}")/libexec/prelude.bash"
 
 
diff --git a/contrib/guix/guix-clean b/contrib/guix/guix-clean
@@ -6,7 +6,7 @@ set -e -o pipefail
 #   1. Checks if we're at the top directory of the Bitcoin Core repository
 #   2. Defines a few common functions and variables
 #
-# shellcheck source=libexec/prelude.bash
+# shellcheck source=contrib/guix/libexec/prelude.bash
 source "$(dirname "${BASH_SOURCE[0]}")/libexec/prelude.bash"
 
 
diff --git a/contrib/guix/guix-codesign b/contrib/guix/guix-codesign
@@ -6,7 +6,7 @@ set -e -o pipefail
 #   1. Checks if we're at the top directory of the Bitcoin Core repository
 #   2. Defines a few common functions and variables
 #
-# shellcheck source=libexec/prelude.bash
+# shellcheck source=contrib/guix/libexec/prelude.bash
 source "$(dirname "${BASH_SOURCE[0]}")/libexec/prelude.bash"
 
 
diff --git a/contrib/guix/guix-verify b/contrib/guix/guix-verify
@@ -6,7 +6,7 @@ set -e -o pipefail
 #   1. Checks if we're at the top directory of the Bitcoin Core repository
 #   2. Defines a few common functions and variables
 #
-# shellcheck source=libexec/prelude.bash
+# shellcheck source=contrib/guix/libexec/prelude.bash
 source "$(dirname "${BASH_SOURCE[0]}")/libexec/prelude.bash"
 
 
diff --git a/contrib/guix/libexec/prelude.bash b/contrib/guix/libexec/prelude.bash
@@ -2,10 +2,10 @@
 export LC_ALL=C
 set -e -o pipefail
 
-# shellcheck source=../../shell/realpath.bash
+# shellcheck source=contrib/shell/realpath.bash
 source contrib/shell/realpath.bash
 
-# shellcheck source=../../shell/git-utils.bash
+# shellcheck source=contrib/shell/git-utils.bash
 source contrib/shell/git-utils.bash
 
 ################
diff --git a/test/lint/lint-shell.sh b/test/lint/lint-shell.sh
@@ -25,7 +25,8 @@ fi
 SHELLCHECK_CMD=(shellcheck --external-sources --check-sourced)
 EXCLUDE="--exclude=$(IFS=','; echo "${disabled[*]}")"
 SOURCED_FILES=$(git ls-files | xargs gawk '/^# shellcheck shell=/ {print FILENAME} {nextfile}')  # Check shellcheck directive used for sourced files
-if ! "${SHELLCHECK_CMD[@]}" "$EXCLUDE" $SOURCED_FILES $(git ls-files -- '*.sh' | grep -vE 'src/(leveldb|secp256k1|minisketch|univalue)/'); then
+mapfile -t GUIX_FILES < <(git ls-files contrib/guix contrib/shell | xargs gawk '/^#!\/usr\/bin\/env bash/ {print FILENAME} {nextfile}')
+if ! "${SHELLCHECK_CMD[@]}" "$EXCLUDE" $SOURCED_FILES "${GUIX_FILES[@]}" $(git ls-files -- '*.sh' | grep -vE 'src/(leveldb|secp256k1|minisketch|univalue)/'); then
     EXIT_CODE=1
 fi
 

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ set -e -o pipefail`
`6`	`6`	`# 1. Checks if we're at the top directory of the Bitcoin Core repository`
`7`	`7`	`# 2. Defines a few common functions and variables`
`8`	`8`	`#`
`9`		`-# shellcheck source=libexec/prelude.bash`
	`9`	`+# shellcheck source=contrib/guix/libexec/prelude.bash`
`10`	`10`	`source "$(dirname "${BASH_SOURCE[0]}")/libexec/prelude.bash"`
`11`	`11`
`12`	`12`