aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfanquake <fanquake@gmail.com>2021-12-01 10:44:32 +0800
committerfanquake <fanquake@gmail.com>2021-12-01 10:44:59 +0800
commitc9d7d0a653910fa3f2dc40e4355c638ec3f0fcb5 (patch)
treee107232391bb956ced9b5b8dfa5d2c40440e97f9
parentaef8c7cf82cff24ddd88fab0a3c5fb93de467886 (diff)
parent5202bd1dc0942953c415ef39c14ffd48cbaab6b9 (diff)
downloadbitcoin-c9d7d0a653910fa3f2dc40e4355c638ec3f0fcb5.tar.xz
Merge bitcoin/bitcoin#23635: test: Bump shellcheck version to 0.8.0
5202bd1dc0942953c415ef39c14ffd48cbaab6b9 test: Bump shellcheck version to 0.8.0 (Hennadii Stepanov) Pull request description: Among [added](https://github.com/koalaman/shellcheck/blob/master/CHANGELOG.md#v080---2021-11-06) rules, SC2295 could be [useful](https://github.com/bitcoin/bitcoin/pull/23506#issuecomment-982201468) for us. ACKs for top commit: dongcarl: Code Review ACK 5202bd1dc0942953c415ef39c14ffd48cbaab6b9 fanquake: ACK 5202bd1dc0942953c415ef39c14ffd48cbaab6b9 - would have rather this just been a part of #23506 to avoid another PR and pointless rebasing. Tree-SHA512: fd7ff801c71af03c5a5b2823b7daba25a430b3ead5e5e50a3663961ee2223e55d322aec91d79999814cd35bd7ed6e9415a0b797718ceb8c0b1dbdbb40c336b82
-rwxr-xr-xci/lint/04_install.sh2
-rwxr-xr-xcontrib/guix/guix-clean2
2 files changed, 2 insertions, 2 deletions
diff --git a/ci/lint/04_install.sh b/ci/lint/04_install.sh
index 251ac76cad..cf203b4940 100755
--- a/ci/lint/04_install.sh
+++ b/ci/lint/04_install.sh
@@ -17,6 +17,6 @@ ${CI_RETRY_EXE} pip3 install mypy==0.910
${CI_RETRY_EXE} pip3 install pyzmq==22.3.0
${CI_RETRY_EXE} pip3 install vulture==2.3
-SHELLCHECK_VERSION=v0.7.2
+SHELLCHECK_VERSION=v0.8.0
curl -sL "https://github.com/koalaman/shellcheck/releases/download/${SHELLCHECK_VERSION}/shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz" | tar --xz -xf - --directory /tmp/
export PATH="/tmp/shellcheck-${SHELLCHECK_VERSION}:${PATH}"
diff --git a/contrib/guix/guix-clean b/contrib/guix/guix-clean
index 9fa17191e8..9af0a793cf 100755
--- a/contrib/guix/guix-clean
+++ b/contrib/guix/guix-clean
@@ -34,7 +34,7 @@ check_tools cat mkdir make git guix
#
under_dir() {
local path_residue
- path_residue="${2##${1}}"
+ path_residue="${2##"${1}"}"
if [ -z "$path_residue" ] || [ "$path_residue" = "$2" ]; then
return 1
else