diff options
| author | Gregory Maxwell <greg@xiph.org> | 2015-11-16 23:28:00 -0800 |
|---|---|---|
| committer | Gregory Maxwell <greg@xiph.org> | 2015-11-16 23:28:37 -0800 |
| commit | eac53ec992018a14db6f8a65a7ce333a4c8284cc (patch) | |
| tree | 5ac3bf7322ea7a047c468cee253cb75212651068 | |
| parent | 87ee0e2dbc1201a5104d524ace32c0134ead019f (diff) | |
| parent | a6d5a6502a3dce23679a9be9e4884a4f77110cd1 (diff) | |
| download | bitcoin-eac53ec992018a14db6f8a65a7ce333a4c8284cc.tar.xz | |
Merge pull request #7026
a6d5a65 [trivial] contrib: Fix `echo`s in verify.sh (MarcoFalke)
141c44e [contrib] Update versionprefix to "bitcoin-core" in verify.sh (MarcoFalke)
| -rwxr-xr-x | contrib/verifysfbinaries/verify.sh | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/contrib/verifysfbinaries/verify.sh b/contrib/verifysfbinaries/verify.sh index 3eb4693883..847c507553 100755 --- a/contrib/verifysfbinaries/verify.sh +++ b/contrib/verifysfbinaries/verify.sh @@ -17,15 +17,15 @@ function clean_up { WORKINGDIR="/tmp/bitcoin" TMPFILE="hashes.tmp" -#this URL is used if a version number is not specified as an argument to the script -SIGNATUREFILE="https://bitcoin.org/bin/0.9.2.1/SHA256SUMS.asc" - SIGNATUREFILENAME="SHA256SUMS.asc" RCSUBDIR="test/" BASEDIR="https://bitcoin.org/bin/" -VERSIONPREFIX="bitcoin-" +VERSIONPREFIX="bitcoin-core-" RCVERSIONSTRING="rc" +#this URL is used if a version number is not specified as an argument to the script +SIGNATUREFILE="$BASEDIR""$VERSIONPREFIX""0.10.4/""$RCSUBDIR""$SIGNATUREFILENAME" + if [ ! -d "$WORKINGDIR" ]; then mkdir "$WORKINGDIR" fi @@ -62,7 +62,7 @@ WGETOUT=$(wget -N "$BASEDIR$SIGNATUREFILENAME" 2>&1) #and then see if wget completed successfully if [ $? -ne 0 ]; then echo "Error: couldn't fetch signature file. Have you specified the version number in the following format?" - echo "[bitcoin-]<version>-[rc[0-9]] (example: bitcoin-0.9.2-rc1)" + echo "[$VERSIONPREFIX]<version>-[$RCVERSIONSTRING[0-9]] (example: "$VERSIONPREFIX"0.10.4-"$RCVERSIONSTRING"1)" echo "wget output:" echo "$WGETOUT"|sed 's/^/\t/g' exit 2 @@ -82,7 +82,7 @@ if [ $RET -ne 0 ]; then echo "Bad signature." elif [ $RET -eq 2 ]; then #or if a gpg error has occurred - echo "gpg error. Do you have Gavin's code signing key installed?" + echo "gpg error. Do you have the Bitcoin Core binary release signing key installed?" fi echo "gpg output:" @@ -116,4 +116,6 @@ fi #everything matches! clean up the mess clean_up $FILES $SIGNATUREFILENAME $TMPFILE +echo -e "Verified hashes of \n$FILES" + exit 0 |