From 4fe0c92eb7259db48ebc169beed6857b6c17b68a Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Tue, 4 Jul 2023 17:36:58 -0500
Subject: [PATCH] Update nodemgmt-scripts.sh

---
 nodemgmt-scripts.sh | 94 ++++++++++++++++++++++-----------------------
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index 5ebd0779..bac058dd 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -772,53 +772,53 @@ NODEUPDATE() {
 	
 	nmdiv=$(ssh -tq root@${nmip} ls -l --time-style=+%s ${NM_FOLDER}/defaults.local.inc  | cut -d ' ' -f 6)
 	
-	# for NTYPE in "${NM_NODE_TYPES[@]}"; do
-	# 	nid=1
-	# 	var=${NTYPE}_HOSTS[@]
-	# 	for nip in "${!var}"; do
-	# 		if [[ ${RUN_NODE_IP} == *"${nip}"* ]]; then
-	# 			nip='localhost  '
-	# 		fi
-	# 		NCMD="ssh -tq root@${nip}"
-	# 		NODE=${NM_HOSTNAMES[${nip}]}[${nip}]
-	# 		c=0; cw=40; spca=''; spc1=${cw}-${#NODE}; until [ $c = ${spc1} ]; do spca="${spca} "; c=`expr $c + 1`; done
-	# 		echo -en "Updating ${NODE}${spca}"
-	#
-	# 		if [ "${2}" != "sync" ]; then
-	# 			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
-	# 				ssh -tq root@${nmip} rsync -az ${NM_FOLDER}/defaults.local.inc root@${nip}:${NM_FOLDER}/ >/dev/null 2>&1
-	# 				echo -e "${idsCL[Green]}Installed & Synced${idsCL[Default]}"
-	# 			else
-	# 			    ${NCMD} "nodemgmt update"
-	# 				# 				    ${NCMD} "nodemgmt update q" >/dev/null 2>&1
-	# 				# echo -e "${idsCL[Green]}Updated${idsCL[Default]}"
-	# 			fi
-	#
-	# 			# echo -en "  ~  ${idsCL[LightCyan]}LinUPx${idsCL[Default]} : "
-	# 			# if ! ${NCMD} command -v runup > /dev/null; then
-	# 			#     ${NCMD} bash <(curl -sL https://go.scity.us/install-linupx) >/dev/null 2>&1
-	# 			# else
-	# 			#     ${NCMD} "runup runup" >/dev/null 2>&1
-	# 			# fi
-	# 			# echo -e "${idsCL[Green]}Updated${idsCL[Default]}"
-	#
-	# 		else
-	# 			echo -en "  ~  ${idsCL[LightCyan]}Sync Defaults${idsCL[Default]} : "
-	# 			if ssh -tq root@${nip} [[ ! -f /opt/idssys/nodemgmt/defaults.local.inc ]] || [ ${nmdiv} -ne $(ssh -tq root@${nip} ls -l --time-style=+%s ${NM_FOLDER}/defaults.local.inc  | cut -d ' ' -f 6) ]; then
-	# 				ssh -tq root@${nmip} rsync -az ${NM_FOLDER}/defaults.local.inc root@${nip}:${NM_FOLDER}/ >/dev/null 2>&1
-	# 				echo -e "${idsCL[Green]}Synced${idsCL[Default]}"
-	# 			else
-	# 				echo -e "${idsCL[Green]}Already Synced${idsCL[Default]}"
-	# 			fi
-	#
-	# 		fi
-	#
-	# 		nid=`expr $nid + 1`
-	# 	done
-	# 	echo
-	# done
+	for NTYPE in "${NM_NODE_TYPES[@]}"; do
+		nid=1
+		var=${NTYPE}_HOSTS[@]
+		for nip in "${!var}"; do
+			if [[ ${RUN_NODE_IP} == *"${nip}"* ]]; then
+				nip='localhost  '
+			fi
+			NCMD="ssh -tq root@${nip}"
+			NODE=${NM_HOSTNAMES[${nip}]}[${nip}]
+			c=0; cw=40; spca=''; spc1=${cw}-${#NODE}; until [ $c = ${spc1} ]; do spca="${spca} "; c=`expr $c + 1`; done
+			echo -en "Updating ${NODE}${spca}"
+
+			if [ "${2}" != "sync" ]; then
+				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
+					ssh -tq root@${nmip} rsync -az ${NM_FOLDER}/defaults.local.inc root@${nip}:${NM_FOLDER}/ >/dev/null 2>&1
+					echo -e "${idsCL[Green]}Installed & Synced${idsCL[Default]}"
+				else
+				    ${NCMD} "nodemgmt update"
+					# 				    ${NCMD} "nodemgmt update q" >/dev/null 2>&1
+					# echo -e "${idsCL[Green]}Updated${idsCL[Default]}"
+				fi
+
+				# echo -en "  ~  ${idsCL[LightCyan]}LinUPx${idsCL[Default]} : "
+				# if ! ${NCMD} command -v runup > /dev/null; then
+				#     ${NCMD} bash <(curl -sL https://go.scity.us/install-linupx) >/dev/null 2>&1
+				# else
+				#     ${NCMD} "runup runup" >/dev/null 2>&1
+				# fi
+				# echo -e "${idsCL[Green]}Updated${idsCL[Default]}"
+
+			else
+				echo -en "  ~  ${idsCL[LightCyan]}Sync Defaults${idsCL[Default]} : "
+				if ssh -tq root@${nip} [[ ! -f /opt/idssys/nodemgmt/defaults.local.inc ]] || [ ${nmdiv} -ne $(ssh -tq root@${nip} ls -l --time-style=+%s ${NM_FOLDER}/defaults.local.inc  | cut -d ' ' -f 6) ]; then
+					ssh -tq root@${nmip} rsync -az ${NM_FOLDER}/defaults.local.inc root@${nip}:${NM_FOLDER}/ >/dev/null 2>&1
+					echo -e "${idsCL[Green]}Synced${idsCL[Default]}"
+				else
+					echo -e "${idsCL[Green]}Already Synced${idsCL[Default]}"
+				fi
+
+			fi
+
+			nid=`expr $nid + 1`
+		done
+		echo
+	done
 	
 	
 	echo -e "${idsCL[Green]}All Nodes have been Updated.${idsCL[Default]}"