accommodate systems that use sha256sum (#7370)

* accommodate systems that use sha256sum
* cleaner use of checkSum
* Merge branch 'master' into shell_script_support4_sha256sum
* Merge branch 'master' into shell_script_support4_sha256sum
This commit is contained in:
George Carder
2020-09-29 05:22:35 -07:00
committed by GitHub
parent fe9921457c
commit 529554f3f9

View File

@@ -119,10 +119,13 @@ function verify() {
if [[ $skip == 1 ]]; then if [[ $skip == 1 ]]; then
return 0 return 0
fi fi
checkSum="shasum -a 256"
hash shasum 2>/dev/null || { hash shasum 2>/dev/null || {
echo >&2 "shasum is not available. Either install it or run with PRYSM_ALLOW_UNVERIFIED_BINARIES=1." checkSum="sha256sum"
exit 1 hash sha256sum 2>/dev/null || {
echo >&2 "SHA checksum utility not available. Either install one (shasum or sha256sum) or run with PRYSM_ALLOW_UNVERIFIED_BINARIES=1."
exit 1
}
} }
hash gpg 2>/dev/null || { hash gpg 2>/dev/null || {
echo >&2 "gpg is not available. Either install it or run with PRYSM_ALLOW_UNVERIFIED_BINARIES=1." echo >&2 "gpg is not available. Either install it or run with PRYSM_ALLOW_UNVERIFIED_BINARIES=1."
@@ -134,7 +137,7 @@ function verify() {
gpg --list-keys $PRYLABS_SIGNING_KEY >/dev/null 2>&1 || curl --silent https://prysmaticlabs.com/releases/pgp_keys.asc | gpg --import gpg --list-keys $PRYLABS_SIGNING_KEY >/dev/null 2>&1 || curl --silent https://prysmaticlabs.com/releases/pgp_keys.asc | gpg --import
( (
cd $wrapper_dir cd $wrapper_dir
shasum -a 256 -c "${file}.sha256" || failed_verification $checkSum -c "${file}.sha256" || failed_verification
) )
( (
cd $wrapper_dir cd $wrapper_dir