From 684d3d18122accfa5d75b060cb5391f7faa99858 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Fri, 29 Nov 2024 19:05:58 -0600
Subject: [PATCH] Update nodemgmt-scripts.sh

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

diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index 5ce683c8..b29c1b86 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -361,7 +361,7 @@ NODEUPDATES() {
 			if [ ! -f /tmp/.nodeupdate.${NM_HOSTNAMES[${nip}]// /-}.running ]; then
 				if [[ ${RUN_NODE_IP} != *"${nip}"* ]]; then
 					touch /tmp/.nodeupdate.${NM_HOSTNAMES[${nip}]// /-}.running
-					NODEUPDATE "${nip}" "${2}" "${NMCMD}" &
+					# NODEUPDATE "${nip}" "${2}" "${NMCMD}" &
 					((ncount++))
 				fi
 			fi
@@ -378,7 +378,7 @@ NODEUPDATES() {
 				((nc_count++))
 			fi
 		done
-		if [ ${nc_count} -eq ${ncount} ]; then
+		if [ ${nc_count} -eq ${ncount} ] || [ ! -f /tmp/.nodeupdate.*.done ]; then
 			completed=true
 			break
 		fi
@@ -414,23 +414,22 @@ NODEUPDATE(){
 		if [ "${betacheck}" == "false" ]; then
 			if [ "${2}" != "sync" ]; then
 				# [ ${noup} -eq 0 ] && echo -en "  ~  ${idsCL[LightCyan]}NodeMGMT${idsCL[Default]} : " >> ${tmpfile}.running
-				
-				# if [ "$(ssh -o BatchMode=yes -o ConnectTimeout=3 root@${nip} echo ok 2>&1)" != "ok" ]; then
-				# 	echo -e "${idsCL[Yellow]}[${nip}] New server, needs SSH credentials${idsCL[Default]}"
-				# 	ssh-copy-id root@${nip}
-				# fi
-				# 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/*.inc ${NM_FOLDER}/conf/*.conf root@${nip}:${NM_FOLDER}/conf/ >/dev/null 2>&1
-				# 	${NMCMD} rsync -az ${NM_FOLDER}/conf/powerwall ${NM_FOLDER}/conf/*.conf root@${nip}:${NM_FOLDER}/conf/ >/dev/null 2>&1
-				# 	sleep 2s
-				# 	[ "${NM_GITPASS}" != "" ] && [ "${NM_GITUSER^^}" == "VOLTRON" ] && ${NMCMD} "bash <(curl -sL https://go.scity.us/add-linux-pass)" >/dev/null 2>&1
-				# 	echo -e "${idsCL[Green]}Installed & Synced${idsCL[Default]}" >> ${tmpfile}.running
-				# elif [ ${noup} -eq 1 ]; then
-				# 	echo -e "${idsCL[Green]}Already Installed${idsCL[Default]}" >> ${tmpfile}.running
-				# else
+				if [ "$(ssh -o BatchMode=yes -o ConnectTimeout=3 root@${nip} echo ok 2>&1)" != "ok" ]; then
+					echo -e "${idsCL[Yellow]}[${nip}] New server, needs SSH credentials${idsCL[Default]}"
+					ssh-copy-id root@${nip}
+				fi
+				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/*.inc ${NM_FOLDER}/conf/*.conf root@${nip}:${NM_FOLDER}/conf/ >/dev/null 2>&1
+					${NMCMD} rsync -az ${NM_FOLDER}/conf/powerwall ${NM_FOLDER}/conf/*.conf root@${nip}:${NM_FOLDER}/conf/ >/dev/null 2>&1
+					sleep 2s
+					[ "${NM_GITPASS}" != "" ] && [ "${NM_GITUSER^^}" == "VOLTRON" ] && ${NMCMD} "bash <(curl -sL https://go.scity.us/add-linux-pass)" >/dev/null 2>&1
+					echo -e "${idsCL[Green]}Installed & Synced${idsCL[Default]}" >> ${tmpfile}.running
+				elif [ ${noup} -eq 1 ]; then
+					echo -e "${idsCL[Green]}Already Installed${idsCL[Default]}" >> ${tmpfile}.running
+				else
 				    ${NCMD} "nodemgmt update q" >> ${tmpfile}.running
-				# fi
+				fi
 			else
 				# echo -en "  ~  ${idsCL[LightCyan]}Sync Shared Nodemgmt Defaults${idsCL[Default]} : " >> ${tmpfile}.running
 				${NMCMD} rsync -az ${NM_FOLDER}/conf/*.inc ${NM_FOLDER}/conf/*.conf root@${nip}:${NM_FOLDER}/conf/ & >/dev/null 2>&1