diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2023-04-04 20:34:58 +0000 |
|---|---|---|
| committer | Cory Fields <cory-nospam-@coryfields.com> | 2023-04-06 19:13:35 +0000 |
| commit | 6d118302654481927e864a428950960e26eb7f4a (patch) | |
| tree | fb18b22e82f3376073929c97df1815582dd8d6fa /contrib | |
| parent | c44323a71705b6df9aafe90df24072e735a5c2ff (diff) | |
| download | bitcoin-6d118302654481927e864a428950960e26eb7f4a.tar.xz | |
verifybinaries: remove awkward bitcoin-core prefix handling
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/verifybinaries/README.md | 8 | ||||
| -rwxr-xr-x | contrib/verifybinaries/verify.py | 7 |
2 files changed, 5 insertions, 10 deletions
diff --git a/contrib/verifybinaries/README.md b/contrib/verifybinaries/README.md index 4f2722b23f..c2b8d2f2dc 100644 --- a/contrib/verifybinaries/README.md +++ b/contrib/verifybinaries/README.md @@ -44,8 +44,6 @@ Validate releases with default settings: ```sh ./contrib/verifybinaries/verify.py pub 22.0 ./contrib/verifybinaries/verify.py pub 22.0-rc2 -./contrib/verifybinaries/verify.py pub bitcoin-core-23.0 -./contrib/verifybinaries/verify.py pub bitcoin-core-23.0-rc1 ``` Get JSON output and don't prompt for user input (no auto key import): @@ -66,12 +64,12 @@ specified keys, while requiring a threshold of at least 10 trusted signatures: If you only want to download the binaries of certain platform, add the corresponding suffix, e.g.: ```sh -./contrib/verifybinaries/verify.py pub bitcoin-core-22.0-osx -./contrib/verifybinaries/verify.py pub bitcoin-core-22.0-rc2-win64 +./contrib/verifybinaries/verify.py pub 22.0-osx +./contrib/verifybinaries/verify.py pub 22.0-rc2-win64 ``` If you do not want to keep the downloaded binaries, specify anything as the second parameter. ```sh -./contrib/verifybinaries/verify.py pub bitcoin-core-22.0 delete +./contrib/verifybinaries/verify.py pub 22.0 delete ``` diff --git a/contrib/verifybinaries/verify.py b/contrib/verifybinaries/verify.py index 83370fbede..e5e171d58d 100755 --- a/contrib/verifybinaries/verify.py +++ b/contrib/verifybinaries/verify.py @@ -99,9 +99,6 @@ VERSION_FORMAT = "<major>.<minor>[.<patch>][-rc[0-9]][-platform]" VERSION_EXAMPLE = "22.0-x86_64 or 0.21.0-rc2-osx" def parse_version_string(version_str): - if version_str.startswith(VERSIONPREFIX): # remove version prefix - version_str = version_str[len(VERSIONPREFIX):] - parts = version_str.split('-') version_base = parts[0] version_rc = "" @@ -290,8 +287,8 @@ def get_files_from_hosts_and_compare( log.error( f"couldn't fetch file ({url}). " "Have you specified the version number in the following format?\n" - f"[{VERSIONPREFIX}]{VERSION_FORMAT} " - f"(example: {VERSIONPREFIX}{VERSION_EXAMPLE})\n" + f"{VERSION_FORMAT} " + f"(example: {VERSION_EXAMPLE})\n" f"wget output:\n{indent(output)}") return ReturnCode.FILE_GET_FAILED else: |