From 17f81e96486780df5d464487975ecb11b278ec8d 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: script: Enable SC2001 rule for Gitian scripts

---
 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 ++-
 4 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'contrib/gitian-descriptors')

diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
index e994ab3cf8..4d7e327359 100644
--- a/contrib/gitian-descriptors/gitian-linux.yml
+++ b/contrib/gitian-descriptors/gitian-linux.yml
@@ -144,7 +144,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/contrib/gitian-descriptors/gitian-osx.yml b/contrib/gitian-descriptors/gitian-osx.yml
index 39e2064c72..125fe6e915 100644
--- a/contrib/gitian-descriptors/gitian-osx.yml
+++ b/contrib/gitian-descriptors/gitian-osx.yml
@@ -107,7 +107,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 245690b03d..3bcf08abb8 100644
--- a/contrib/gitian-descriptors/gitian-win-signer.yml
+++ b/contrib/gitian-descriptors/gitian-win-signer.yml
@@ -37,6 +37,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 bb6f3fde1d..751204d366 100644
--- a/contrib/gitian-descriptors/gitian-win.yml
+++ b/contrib/gitian-descriptors/gitian-win.yml
@@ -114,7 +114,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
-- 
cgit v1.2.3