From ac68e5720d548cb58681526592bf4f8272e74715 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Thu, 23 Nov 2023 21:06:18 -0600
Subject: [PATCH] Update add-linux-pass.sh

---
 add-linux-pass.sh | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/add-linux-pass.sh b/add-linux-pass.sh
index 1ddcb9b..02a34b9 100755
--- a/add-linux-pass.sh
+++ b/add-linux-pass.sh
@@ -3,27 +3,16 @@
 if [ -d /opt/idssys/defaults ]; then
 	source /opt/idssys/defaults/colors.inc
 	source /opt/idssys/defaults/default.inc
+	[ -d /opt/idssys/nodemgmt ] && source /opt/idssys/nodemgmt/defaults.inc
 else
 	source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)"
 	source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)"
 fi
 
-if [ -d /opt/idssys/nodemgmt ]; then
-	source /opt/idssys/nodemgmt/defaults.inc
-fi
-
-
-echo ""
-echo -e "${idsCL[LightGreen]}Adding Linux Pass Sync${idsCL[Default]}"
-echo ""
-
-apt -y install pass git curl gpg
-
-git clone https://git.schroedercity.com/voltron/ids-linux-pass.git ~/.password-store
-chmod -R 600 /root/.password-store
-git config --global credential.helper store
-
-if [ "${NM_GITUSER}" == "" ] || [ "${NM_GITPASS}" == "" ]; then
+if [ "${NM_GITUSER}" != "" ] && [ "${NM_GITPASS}" != "" ]; then
+	gituser=${NM_GITUSER}
+	gitpass=${NM_GITPASS}
+else	
 	echo -e "${idsCL[LightCyan]}You'll need to authorize yourself${idsCL[Default]}\n"
 	until [ "${gituser}" != "" ]; do
 		echo -en "${idsCL[LightCyan]}Username: ${idsCL[Default]}"
@@ -35,14 +24,27 @@ if [ "${NM_GITUSER}" == "" ] || [ "${NM_GITPASS}" == "" ]; then
 		read gitpass
 		echo
 	done
-else
-	gituser=${NM_GITUSER}
-	gitpass=${NM_GITPASS}
+fi
+if [ "$(curl -u "${gituser}:${gitpass}" -sL https://git.schroedercity.com/voltron/private/raw/branch/master/secret.gpg)" == "Verify" ]; then
+	echo -e "${idsCL[LightRed]}Authorization Failed${idsCL[Default]}\n"
+	exit 1
 fi
 
+echo ""
+echo -e "${idsCL[LightGreen]}Adding Linux Pass Sync${idsCL[Default]}"
+echo ""
 
-curl -u "${gituser}:${gitpass}" -L -o /tmp/secret.gpg https://git.schroedercity.com/voltron/private/raw/branch/master/secret.gpg
-curl -u "${gituser}:${gitpass}" -L -o /tmp/idsvc.key https://git.schroedercity.com/voltron/private/raw/branch/master/idsvc.key
+apt -y install pass git curl gpg
+
+git clone https://git.schroedercity.com/voltron/ids-linux-pass.git ~/.password-store
+chmod -R 600 /root/.password-store
+git config --global credential.helper store
+
+
+
+
+curl -u "${gituser}:${gitpass}" -sL -o /tmp/secret.gpg https://git.schroedercity.com/voltron/private/raw/branch/master/secret.gpg
+curl -u "${gituser}:${gitpass}" -sL -o /tmp/idsvc.key https://git.schroedercity.com/voltron/private/raw/branch/master/idsvc.key
 gpg --import /tmp/secret.gpg
 gpg --import /tmp/idsvc.key
 rm -f /tmp/secret.gpg /tmp/idsvc.key