aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2016-04-25 13:31:11 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2016-04-25 13:31:22 +0200
commitc4e8390047a1ba14e32ac4f3e3ac425eb5824f21 (patch)
treeebb2e63eba4a581379d37875acee16efd0a9e399 /contrib
parentf9c2ac72327e611361cb6cd707b770f161238701 (diff)
parentf1544700703a442191ac1dfaae7f31b04ba7b12b (diff)
Merge #7881: Update release process
f154470 [contrib] Remove reference to sf and add doc to verify.sh (MarcoFalke) 182bec4 contrib: remove hardcoded version from verify.sh (Wladimir J. van der Laan) c907f4d doc: Update release process (Wladimir J. van der Laan)
Diffstat (limited to 'contrib')
-rw-r--r--contrib/README.md4
-rw-r--r--contrib/verifybinaries/README.md (renamed from contrib/verifysfbinaries/README.md)9
-rwxr-xr-xcontrib/verifybinaries/verify.sh (renamed from contrib/verifysfbinaries/verify.sh)6
3 files changed, 12 insertions, 7 deletions
diff --git a/contrib/README.md b/contrib/README.md
index 32b3a170ac..a23b197cc6 100644
--- a/contrib/README.md
+++ b/contrib/README.md
@@ -51,5 +51,5 @@ Test and Verify Tools
### [TestGen](/contrib/testgen) ###
Utilities to generate test vectors for the data-driven Bitcoin tests.
-### [Verify SF Binaries](/contrib/verifysfbinaries) ###
-This script attempts to download and verify the signature file SHA256SUMS.asc from SourceForge.
+### [Verify Binaries](/contrib/verifybinaries) ###
+This script attempts to download and verify the signature file SHA256SUMS.asc from bitcoin.org.
diff --git a/contrib/verifysfbinaries/README.md b/contrib/verifybinaries/README.md
index 1db3fe52fc..8970f3daa4 100644
--- a/contrib/verifysfbinaries/README.md
+++ b/contrib/verifybinaries/README.md
@@ -1,6 +1,13 @@
-### Verify Binaries ###
+### Verify Binaries
This script attempts to download the signature file `SHA256SUMS.asc` from https://bitcoin.org.
It first checks if the signature passes, and then downloads the files specified in the file, and checks if the hashes of these files match those that are specified in the signature file.
The script returns 0 if everything passes the checks. It returns 1 if either the signature check or the hash check doesn't pass. If an error occurs the return value is 2.
+
+Usage:
+
+```sh
+./verify.sh bitcoin-core-0.11.2
+./verify.sh bitcoin-core-0.12.0
+```
diff --git a/contrib/verifysfbinaries/verify.sh b/contrib/verifybinaries/verify.sh
index 847c507553..657c3bd33c 100755
--- a/contrib/verifysfbinaries/verify.sh
+++ b/contrib/verifybinaries/verify.sh
@@ -23,9 +23,6 @@ BASEDIR="https://bitcoin.org/bin/"
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
@@ -53,7 +50,8 @@ if [ -n "$1" ]; then
SIGNATUREFILE="$BASEDIR$SIGNATUREFILENAME"
else
- BASEDIR="${SIGNATUREFILE%/*}/"
+ echo "Error: need to specify a version on the command line"
+ exit 2
fi
#first we fetch the file containing the signature