From c23889a1506744a51b00c66572cfa2875b392dd5 Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Sun, 3 Nov 2019 22:32:50 +0200 Subject: [PATCH] script: Enable SC2001 rule for Gitian scripts (cherry picked from commit bitcoin/bitcoin@17f81e96486780df5d464487975ecb11b278ec8d) --- contrib/gitian-descriptors/gitian-linux.yml | 3 ++- contrib/gitian-descriptors/gitian-osx.yml | 2 +- contrib/gitian-descriptors/gitian-win-signer.yml | 2 +- contrib/gitian-descriptors/gitian-win.yml | 3 ++- test/lint/lint-shell.sh | 1 - 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml index c70900a8e..3e5b385f4 100644 --- a/contrib/gitian-descriptors/gitian-linux.yml +++ b/contrib/gitian-descriptors/gitian-linux.yml @@ -102,7 +102,8 @@ script: | CONFIG_SITE=${BASEPREFIX}/$(echo "${HOSTS}" | awk '{print $1;}')/share/config.site ./configure --prefix=/ make dist SOURCEDIST=$(echo zcash-*.tar.gz) - DISTNAME=$(echo ${SOURCEDIST} | sed 's/.tar.*//') + DISTNAME=${SOURCEDIST/%.tar.gz} + # Correct tar file order mkdir -p temp pushd temp diff --git a/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml index 8b7f37baa..cb0a968c9 100644 --- a/contrib/gitian-descriptors/gitian-osx.yml +++ b/contrib/gitian-descriptors/gitian-osx.yml @@ -97,7 +97,7 @@ script: | CONFIG_SITE=${BASEPREFIX}/$(echo "${HOSTS}" | awk '{print $1;}')/share/config.site ./configure --prefix=/ make dist SOURCEDIST=$(echo bitcoin-*.tar.gz) - DISTNAME=$(echo ${SOURCEDIST} | sed 's/.tar.*//') + DISTNAME=${SOURCEDIST/%.tar.gz} # Correct tar file order mkdir -p temp diff --git a/contrib/gitian-descriptors/gitian-win-signer.yml b/contrib/gitian-descriptors/gitian-win-signer.yml index 4cad8e306..3f2c540ae 100644 --- a/contrib/gitian-descriptors/gitian-win-signer.yml +++ b/contrib/gitian-descriptors/gitian-win-signer.yml @@ -33,6 +33,6 @@ script: | make find ${UNSIGNED_DIR} -name "*-unsigned.exe" | while read i; do INFILE="$(basename "${i}")" - OUTFILE="$(echo "${INFILE}" | sed s/-unsigned//)" + OUTFILE="${INFILE/%-unsigned}" ./osslsigncode attach-signature -in "${i}" -out "${OUTDIR}/${OUTFILE}" -sigin "${SIGDIR}/${INFILE}.pem" done diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml index bf79abc16..9ae0f21fb 100644 --- a/contrib/gitian-descriptors/gitian-win.yml +++ b/contrib/gitian-descriptors/gitian-win.yml @@ -118,7 +118,8 @@ script: | CONFIG_SITE=${BASEPREFIX}/$(echo "${HOSTS}" | awk '{print $1;}')/share/config.site ./configure --prefix=/ make dist SOURCEDIST=$(echo bitcoin-*.tar.gz) - DISTNAME=$(echo ${SOURCEDIST} | sed 's/.tar.*//') + DISTNAME=${SOURCEDIST/%.tar.gz} + # Correct tar file order mkdir -p temp pushd temp diff --git a/test/lint/lint-shell.sh b/test/lint/lint-shell.sh index 5b3f61d63..0c45d2413 100755 --- a/test/lint/lint-shell.sh +++ b/test/lint/lint-shell.sh @@ -24,7 +24,6 @@ disabled=( SC2162 # read without -r will mangle backslashes. ) disabled_gitian=( - SC2001 # See if you can use ${variable//search/replace} instead. SC2035 # Use ./*glob* or -- *glob* so names with dashes won't become options. SC2043 # This loop will only ever run once for a constant value. Did you perhaps mean to loop over dir/*, $var or $(cmd)? SC2094 # Make sure not to read and write the same file in the same pipeline.