sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 04:22:55 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #10771: Remove unused variables in shell scripts

Browse Source 
ab8e8b9 Remove unused variables in shell scripts. (practicalswift)

Pull request description:

  Remove unused variables in shell scripts. Use `_` where we don't care about the result.

Tree-SHA512: 35049e79ee432c805f061456c32902a92811b5214d50ce6770b22d1442cc5999ed53cfe05bb2347f6995ca33c707a0f3fe92d5829c0385c4a3e254953924cbc4
This commit is contained in:
Wladimir J. van der Laan 2017-11-09 21:15:54 +01:00
commit 23e9074e0a
No known key found for this signature in database
GPG Key ID: 1E4AED62986CD25D
4 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/devtools/git-subtree-check.sh
View File

@ -18,7 +18,7 @@ find_latest_squash()
sub= sub=
git log --grep="^git-subtree-dir: $dir/*\$" \ git log --grep="^git-subtree-dir: $dir/*\$" \
--pretty=format:'START %H%n%s%n%n%b%nEND%n' "$COMMIT" | --pretty=format:'START %H%n%s%n%n%b%nEND%n' "$COMMIT" |
while read a b junk; do while read a b _; do
case "$a" in case "$a" in
START) sq="$b" ;; START) sq="$b" ;;
git-subtree-mainline:) main="$b" ;; git-subtree-mainline:) main="$b" ;;
@ -48,7 +48,6 @@ if [ -z "$latest_squash" ]; then
fi fi
set $latest_squash set $latest_squash
old=$1
rev=$2 rev=$2
if [ "d$(git cat-file -t $rev 2>/dev/null)" != dcommit ]; then if [ "d$(git cat-file -t $rev 2>/dev/null)" != dcommit ]; then
echo "ERROR: subtree commit $rev unavailable. Fetch/update the subtree repository" >&2 echo "ERROR: subtree commit $rev unavailable. Fetch/update the subtree repository" >&2

1
contrib/gitian-build.sh
View File

@ -6,7 +6,6 @@
sign=false sign=false
verify=false verify=false
build=false build=false
setupenv=false
# Systems to build # Systems to build
linux=true linux=true

6
contrib/verify-commits/verify-commits.sh
View File

@ -12,8 +12,6 @@ VERIFIED_ROOT=$(cat "${DIR}/trusted-git-root")
VERIFIED_SHA512_ROOT=$(cat "${DIR}/trusted-sha512-root-commit") VERIFIED_SHA512_ROOT=$(cat "${DIR}/trusted-sha512-root-commit")
REVSIG_ALLOWED=$(cat "${DIR}/allow-revsig-commits") REVSIG_ALLOWED=$(cat "${DIR}/allow-revsig-commits")
HAVE_FAILED=false
HAVE_GNU_SHA512=1 HAVE_GNU_SHA512=1
[ ! -x "$(which sha512sum)" ] && HAVE_GNU_SHA512=0 [ ! -x "$(which sha512sum)" ] && HAVE_GNU_SHA512=0
@ -95,9 +93,9 @@ while true; do
FILE_HASHES="" FILE_HASHES=""
for FILE in $(git ls-tree --full-tree -r --name-only "$CURRENT_COMMIT" | LC_ALL=C sort); do for FILE in $(git ls-tree --full-tree -r --name-only "$CURRENT_COMMIT" | LC_ALL=C sort); do
if [ "$HAVE_GNU_SHA512" = 1 ]; then if [ "$HAVE_GNU_SHA512" = 1 ]; then
HASH=$(git cat-file blob "$CURRENT_COMMIT":"$FILE" | sha512sum | { read FIRST OTHER; echo $FIRST; } ) HASH=$(git cat-file blob "$CURRENT_COMMIT":"$FILE" | sha512sum | { read FIRST _; echo $FIRST; } )
else else
HASH=$(git cat-file blob "$CURRENT_COMMIT":"$FILE" | shasum -a 512 | { read FIRST OTHER; echo $FIRST; } ) HASH=$(git cat-file blob "$CURRENT_COMMIT":"$FILE" | shasum -a 512 | { read FIRST _; echo $FIRST; } )
fi fi
[ "$FILE_HASHES" != "" ] && FILE_HASHES="$FILE_HASHES"' [ "$FILE_HASHES" != "" ] && FILE_HASHES="$FILE_HASHES"'
' '

2
contrib/verifybinaries/verify.sh
View File

@ -76,8 +76,6 @@ if [ -n "$1" ]; then
BASEDIR="$BASEDIR$RCSUBDIR.$RCVERSION/" BASEDIR="$BASEDIR$RCSUBDIR.$RCVERSION/"
fi fi
fi fi
SIGNATUREFILE="$BASEDIR$SIGNATUREFILENAME"
else else
echo "Error: need to specify a version on the command line" echo "Error: need to specify a version on the command line"
exit 2 exit 2