From 37fcc77da9c66499ff7d560653e00256714de8cd Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 25 Nov 2023 18:51:06 -0600
Subject: [PATCH] Update nodemgmt-scripts.sh

---
 nodemgmt-scripts.sh | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index 122c456d..1f3c9d4a 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -364,24 +364,34 @@ NODEUPDATES() {
 NODEUPDATE(){
 	nip="${1}"
 	NMCMD="${3}"
+	if [ "${NMCMD}" == "ssh" ]; then
+		noup=1
+		NMCMD=''
+	else
+		noup=0
+	fi
 	NCMD="ssh -tq root@${nip}"
 	NODE="${NM_HOSTNAMES[${nip}]} [${nip}]"
 	
-	c=0; spca=''; spc1=${cw}-${#NODE}; until [ $c = ${spc1} ]; do spca="${spca} "; c=`expr $c + 1`; done
-	echo -en "Updating ${NODE}${spca}"
+	if [ ${noup} -eq 0 ]; then
+		c=0; spca=''; spc1=${cw}-${#NODE}; until [ $c = ${spc1} ]; do spca="${spca} "; c=`expr $c + 1`; done
+		echo -en "Updating ${NODE}${spca}"
+	fi
 	
 	if [ "${nip}" != "100.100.2.1" ] && [ "${nip}" != "10.2.1.1" ] && [ ! -f ${NM_TMPFOLDER}/${nip}.down ]; then
 		if [ "${2}" != "sync" ]; then
-			echo -en "  ~  ${idsCL[LightCyan]}NodeMGMT${idsCL[Default]} : "
+			[ ${noup} -eq 0 ] && echo -en "  ~  ${idsCL[LightCyan]}NodeMGMT${idsCL[Default]} : "
 			if ! ${NCMD} command -v nodemgmt > /dev/null; then
 			    ${NCMD} "bash <(curl -sL https://go.scity.us/install-nodemgmt)" >/dev/null 2>&1
 				${NMCMD} rsync -az ${NM_FOLDER}/conf/defaults.local.inc ${NM_FOLDER}/conf/ssl-domain-checks.conf root@${nip}:${NM_FOLDER}/conf/ & >/dev/null 2>&1
 				echo -e "${idsCL[Green]}Installed & Synced${idsCL[Default]}"
+			elif [ ${noup} -eq 1 ]; then
+				echo -e "${idsCL[Green]}Already Installed${idsCL[Default]}"
 			else
 			    ${NCMD} "nodemgmt update q"
 			fi
 		else
-			echo -en "  ~  ${idsCL[LightCyan]}Sync Shared Nodemgmt Defaults${idsCL[Default]} : "
+			[ ${noup} -eq 0 ] && echo -en "  ~  ${idsCL[LightCyan]}Sync Shared Nodemgmt Defaults${idsCL[Default]} : "
 			${NMCMD} rsync -az ${NM_FOLDER}/conf/defaults.local.inc ${NM_FOLDER}/conf/ssl-domain-checks.conf root@${nip}:${NM_FOLDER}/conf/ & >/dev/null 2>&1
 			echo -e "${idsCL[Green]}Files Synced${idsCL[Default]}"
 
@@ -733,8 +743,10 @@ SETUPSSH(){
 		for nip in "${!var}"; do
 			if [[ ${RUN_NODE_IP} != *"${nip}"* ]]; then
 				echo -e " ${idsST[Bold]}${idsCL[LightCyan]}${NM_HOSTNAMES[${nip}]}[${nip}]${idsST[Reset]}${idsCL[Default]}"
-				
+				echo -e "\n${idsCL[LightCyan]}Copying Public SSH Key ...${idsCL[Default]}"
 				ssh-copy-id root@${nip}
+				echo -e "\n${idsCL[LightCyan]}Verifying NodeMgmt ...${idsCL[Default]}"
+				NODEUPDATE "${nip}" "${2}" "${NMCMD}"
 				
 				
 				echo