diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-01 15:55:25 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-01 15:57:01 +0200 |
commit | 44691f3c51c9bbb6d49ef14c723f84cb06bb1201 (patch) | |
tree | 87b6dc749820b3aacc26e1e7418a8f77275dbab2 /contrib/verifybinaries/verify.sh | |
parent | 0e563d89c07573d56885f69e44adf9c28247b917 (diff) | |
parent | faaed8874f83373e54a1878c5c7381ce47557bb8 (diff) | |
download | bitcoin-44691f3c51c9bbb6d49ef14c723f84cb06bb1201.tar.xz |
Merge #8557: [contrib] Rework verifybinaries
faaed88 [contrib] verifybinaries: Mention mandatory preparation step (MarcoFalke)
fa917f6 [contrib] verifybinaries: Keep downloads by default (MarcoFalke)
fab1f92 [contrib] verifybinaries: Adjust parsing to new rc path (MarcoFalke)
Diffstat (limited to 'contrib/verifybinaries/verify.sh')
-rwxr-xr-x | contrib/verifybinaries/verify.sh | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/contrib/verifybinaries/verify.sh b/contrib/verifybinaries/verify.sh index 657c3bd33c..e22b911743 100755 --- a/contrib/verifybinaries/verify.sh +++ b/contrib/verifybinaries/verify.sh @@ -14,11 +14,11 @@ function clean_up { done } -WORKINGDIR="/tmp/bitcoin" +WORKINGDIR="/tmp/bitcoin_verify_binaries" TMPFILE="hashes.tmp" SIGNATUREFILENAME="SHA256SUMS.asc" -RCSUBDIR="test/" +RCSUBDIR="test" BASEDIR="https://bitcoin.org/bin/" VERSIONPREFIX="bitcoin-core-" RCVERSIONSTRING="rc" @@ -43,7 +43,7 @@ if [ -n "$1" ]; then # and simultaneously add RCSUBDIR to BASEDIR, where we will look for SIGNATUREFILENAME if [[ $VERSION == *"$RCVERSIONSTRING"* ]]; then BASEDIR="$BASEDIR${VERSION/%-$RCVERSIONSTRING*}/" - BASEDIR="$BASEDIR$RCSUBDIR" + BASEDIR="$BASEDIR$RCSUBDIR.$RCVERSIONSTRING${VERSION: -1}/" else BASEDIR="$BASEDIR$VERSION/" fi @@ -93,7 +93,7 @@ fi FILES=$(awk '{print $2}' "$TMPFILE") #and download these one by one -for file in in $FILES +for file in $FILES do wget --quiet -N "$BASEDIR$file" done @@ -108,11 +108,16 @@ if [ $? -eq 1 ]; then exit 1 elif [ $? -gt 1 ]; then echo "Error executing 'diff'" - exit 2 + exit 2 fi -#everything matches! clean up the mess -clean_up $FILES $SIGNATUREFILENAME $TMPFILE +if [ -n "$2" ]; then + echo "Clean up the binaries" + clean_up $FILES $SIGNATUREFILENAME $TMPFILE +else + echo "Keep the binaries in $WORKINGDIR" + clean_up $TMPFILE +fi echo -e "Verified hashes of \n$FILES" |