From 0806807d613e7241afc8a5d5b774e415ac2663bc Mon Sep 17 00:00:00 2001
From: Victor Farazdagi <simple.square@gmail.com>
Date: Sun, 26 Apr 2020 17:09:09 +0300
Subject: [PATCH] fixes bug with binary verification (#5627)

* fixes bug with binary verification
* Merge branch 'master' into fix-prysm-sh-verification-bug
* better err message
* Merge branch 'fix-prysm-sh-verification-bug' of github.com:prysmaticlabs/prysm into fix-prysm-sh-verification-bug
---
 prysm.sh | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/prysm.sh b/prysm.sh
index 0602d7f6c..215c419aa 100755
--- a/prysm.sh
+++ b/prysm.sh
@@ -113,8 +113,13 @@ function get_prysm_version() {
 function verify() {
   file=$1
 
-  hash shasum 2>/dev/null || { echo >&2 "shasum is not available. Not verifying integrity of downloaded binary."; return failed_verification; }
-  hash gpg 2>/dev/null || { echo >&2 "gpg is not available. Not verifying integrity of downloaded binary."; return failed_verification; }
+  skip=${PRYSM_ALLOW_UNVERIFIED_BINARIES-0}
+  if [[ $skip == 1 ]]; then
+    return 0
+  fi
+
+  hash shasum 2>/dev/null || { echo >&2 "shasum is not available. Either install it or run with PRYSM_ALLOW_UNVERIFIED_BINARIES=1."; exit 1; }
+  hash gpg 2>/dev/null || { echo >&2 "gpg is not available. Either install it or run with PRYSM_ALLOW_UNVERIFIED_BINARIES=1."; exit 1; }
 
   color "37" "Verifying binary integrity."
 
@@ -126,16 +131,16 @@ function verify() {
 }
 
 function failed_verification() {
-  skip=${PRYSM_ALLOW_UNVERIFIED_BINARIES-0}
-  if [[ $skip == 1 ]]; then
-    return 0
-  fi
-  color "31" "Failed to verify Prysm binary. Please erase downloads in the \
-dist directory and run this script again. Alternatively, you can use a \
-A prior version by specifying environment variable USE_PRYSM_VERSION \
-with the specific version, as desired. Example: USE_PRYSM_VERSION=v1.0.0-alpha.5 \
-If you must wish to continue running an unverified binary, specific the \
-environment variable PRYSM_ALLOW_UNVERIFIED_BINARIES=1"
+MSG=$(cat <<-END
+Failed to verify Prysm binary. Please erase downloads in the
+dist directory and run this script again. Alternatively, you can use a
+A prior version by specifying environment variable USE_PRYSM_VERSION
+with the specific version, as desired. Example: USE_PRYSM_VERSION=v1.0.0-alpha.5
+If you must wish to continue running an unverified binary, specific the
+environment variable PRYSM_ALLOW_UNVERIFIED_BINARIES=1
+END
+)
+  color "31" "$MSG"
   exit 1
 }