From ac0c3be923ff2439e13ce12dfd89530799be2883 Mon Sep 17 00:00:00 2001
From: danielclough <danielclough@gmail.com>
Date: Sat, 26 Dec 2020 15:45:01 +0100
Subject: [PATCH] fix env and install script

---
 Jenkinsfile             |  2 +-
 contrib/docker/build.sh | 26 ++++++++++++++++++++++----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 16825740a..7b07e14e8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,7 +3,7 @@ pipeline {
     stages {
         stage('build') {
             steps {
-              sh "contrib/docker/build.sh -o aarch64-linux-gnu blackcoinnl github CoinBlack env.GIT_LOCAL_BRANCH Etc/UTC"
+              sh "contrib/docker/build.sh -o aarch64-linux-gnu blackcoinnl github CoinBlack" + env.GIT_LOCAL_BRANCH + "Etc/UTC"
             }
         }
     }
diff --git a/contrib/docker/build.sh b/contrib/docker/build.sh
index 8cc00e30e..969af5e30 100755
--- a/contrib/docker/build.sh
+++ b/contrib/docker/build.sh
@@ -84,7 +84,25 @@ else
 	# Download Dependencies
 
 	if [[ -f ${BASE_DIR}/depends-${architecture}.tar.xz ]]; then
-		echo "Dependencies exist!" 
+		echo "Dependencies exist! Checking sha256sum!";
+
+		case $architecture in
+			aarch64-linux-gnu)
+				checkSUM=`echo "f6f1b099d876db90396d0d56eb5b3f366f14c90e077524e2b10bfdaaa1aa5805 ${BASE_DIR}/depends-${architecture}.tar.xz" | sha256sum --check | awk '{print $2}' 2> /dev/null`
+				[[ "${checkSUM}" == "OK" ]] && 	echo "The sha256sum is OK! You will need sudo to untar the dependencies." && sudo tar xJf ${BASE_DIR}/depends-${architecture}.tar.xz -C ${BASE_DIR} \
+					|| exit 1					
+			;;
+			arm-linux-gnueabihf)
+				checkSUM=`echo "339c1159adcccecb45155b316f1f5772009b92acb8cfed29464dd7f09775fb79 ${BASE_DIR}/depends-${architecture}.tar.xz" | sha256sum --check | awk '{print $2}' 2> /dev/null`
+				[[ "${checkSUM}" == "OK" ]] && 	echo "The sha256sum is OK! You will need sudo to untar the dependencies." && sudo tar xJf ${BASE_DIR}/depends-${architecture}.tar.xz -C ${BASE_DIR} \
+					|| exit 1
+			;;
+			x86_64-linux-gnu)
+				checkSUM=`echo "eed063b26f4c4e0fa35dc085fe09bafd4251cffa76cdabb26bf43077da03b84e ${BASE_DIR}/depends-${architecture}.tar.xz" | sha256sum --check | awk '{print $2}' 2> /dev/null`
+				[[ "${checkSUM}" == "OK" ]] && 	echo "The sha256sum is OK! You will need sudo to untar the dependencies." && sudo tar xJf ${BASE_DIR}/depends-${architecture}.tar.xz -C ${BASE_DIR} \
+					|| exit 1
+			;;
+		esac
 	else
 		wget -qO ${BASE_DIR}/depends-${architecture}.tar.xz https://admin.blackcoin.nl/static/depends-${architecture}.tar.xz 
 
@@ -92,17 +110,17 @@ else
 			aarch64-linux-gnu)
 				checkSUM=`echo "f6f1b099d876db90396d0d56eb5b3f366f14c90e077524e2b10bfdaaa1aa5805 ${BASE_DIR}/depends-${architecture}.tar.xz" | sha256sum --check | awk '{print $2}' 2> /dev/null`
 				[[ "${checkSUM}" == "OK" ]] && 	echo "The sha256sum is OK! You will need sudo to untar the dependencies." && sudo tar xJf ${BASE_DIR}/depends-${architecture}.tar.xz -C ${BASE_DIR} \
-					|| (>&2 echo 'SHASUM FAIL'; exit 1)
+					|| exit 1
 			;;
 			arm-linux-gnueabihf)
 				checkSUM=`echo "339c1159adcccecb45155b316f1f5772009b92acb8cfed29464dd7f09775fb79 ${BASE_DIR}/depends-${architecture}.tar.xz" | sha256sum --check | awk '{print $2}' 2> /dev/null`
 				[[ "${checkSUM}" == "OK" ]] && 	echo "The sha256sum is OK! You will need sudo to untar the dependencies." && sudo tar xJf ${BASE_DIR}/depends-${architecture}.tar.xz -C ${BASE_DIR} \
-					|| (>&2 echo 'SHASUM FAIL'; exit 1)
+					|| exit 1
 			;;
 			x86_64-linux-gnu)
 				checkSUM=`echo "eed063b26f4c4e0fa35dc085fe09bafd4251cffa76cdabb26bf43077da03b84e ${BASE_DIR}/depends-${architecture}.tar.xz" | sha256sum --check | awk '{print $2}' 2> /dev/null`
 				[[ "${checkSUM}" == "OK" ]] && 	echo "The sha256sum is OK! You will need sudo to untar the dependencies." && sudo tar xJf ${BASE_DIR}/depends-${architecture}.tar.xz -C ${BASE_DIR} \
-					|| (>&2 echo 'SHASUM FAIL'; exit 1)
+					|| exit 1
 			;;
 		esac
 		echo -e "