From b8cb511da7db8be8f37fc8213c474f57082d8aa0 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Tue, 12 Dec 2023 09:31:17 -0600
Subject: [PATCH] Update nodemgmt-scripts.sh

---
 nodemgmt-scripts.sh | 58 ++++++++++++++++++++-------------------------
 1 file changed, 26 insertions(+), 32 deletions(-)

diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index 85364132..9bdb5463 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -749,14 +749,14 @@ MAINTENANCE_MODE(){
 	declare -i cw; declare -i spc1; declare -i c
 	item_number=1
 	
-	for NODETYPE in "${ntypesel[@]}"; do
+	for NTYPE in "${ntypesel[@]}"; do
 
-		dockers=${NODETYPE}_DOCKERS_CHECK[@]
-		hosts=${NODETYPE}_HOSTS[@]
+		dockers=${NTYPE}_DOCKERS_CHECK[@]
+		hosts=${NTYPE}_HOSTS[@]
 	
-		NTHOSTS=${NODETYPE}_HOSTS[@]
+		NTHOSTS=${NTYPE}_HOSTS[@]
 		
-		if ([[ ! -v ${NODETYPE}_DOCKERS_CHECK ]] && [ "${MM_ACTION}" == "dockers" ]) || ([ "${NM_SERVICES_CHECK[${NODETYPE}]}" == "" ] && [ "${MM_ACTION}" == "services" ]); then
+		if ([[ ! -v ${NTYPE}_DOCKERS_CHECK ]] && [ "${MM_ACTION}" == "dockers" ]) || ([ "${NM_SERVICES_CHECK[${NTYPE}]}" == "" ] && [ "${MM_ACTION}" == "services" ]); then
 			GOFORCHECK=false;
 		else
 			GOFORCHECK=true;
@@ -781,11 +781,11 @@ MAINTENANCE_MODE(){
 				########################
 				## SERVICES CHECK
 				########################						
-				if [ "${MM_ACTION}" != "dockers" ] && [ "${NM_SERVICES_CHECK[${NODETYPE}]}" != "" ]; then
+				if [ "${MM_ACTION}" != "dockers" ] && [ "${NM_SERVICES_CHECK[${NTYPE}]}" != "" ]; then
 					echo -e "${idsCL[Green]} System Service(s)${idsCL[Default]}"
 					DIVIDER . green 52
 				
-					srvcs=${NODETYPE}_SERVICES_CHECK[@];
+					srvcs=${NTYPE}_SERVICES_CHECK[@];
 					srvcstotest="$(join_by " " ${!srvcs})"
 					for srvc in "${!srvcs}"; do
 						if [ ${item_number} -lt 10 ]; then isel="  ${item_number})"; elif [ ${item_number} -lt 100 ]; then isel=" ${item_number})"; else isel="${item_number})"; fi
@@ -801,9 +801,9 @@ MAINTENANCE_MODE(){
 				########################
 				## DOCKER CHECK
 				########################
-				if [[ -v ${NODETYPE}_DOCKERS_CHECK ]] && [ "${MM_ACTION}" != "services" ]; then
+				if [[ -v ${NTYPE}_DOCKERS_CHECK ]] && [ "${MM_ACTION}" != "services" ]; then
 					if [ "${MM_ACTION}" != "check" ]; then
-						[ "${MM_ACTION}" == "" ] && [ "${NM_SERVICES_CHECK[${NODETYPE}]}" != "" ] && echo
+						[ "${MM_ACTION}" == "" ] && [ "${NM_SERVICES_CHECK[${NTYPE}]}" != "" ] && echo
 						echo -e "${idsCL[Green]} Docker Service(s)${idsCL[Default]}"
 						DIVIDER . green 52
 					fi
@@ -823,33 +823,27 @@ MAINTENANCE_MODE(){
 	
 				if [ "${STATUS_ACTION}" == "repl" ] || [ "${STATUS_ACTION}" == "" ] || ([ "${STATUS_ACTION}" == "report" ] && [ ${REPLRUN} -eq 1 ]); then
 					if [ "${MM_ACTION}" != "check" ]; then
-						[ "${MM_ACTION}" == "" ] && [ "${NM_REPL_CHECK[${NODETYPE}]}" != "" ] && echo
+						[ "${MM_ACTION}" == "" ] && [ "${NM_REPL_CHECK[${NTYPE}]}" != "" ] && echo
 						echo -e "${idsCL[Green]} Replication Check(s)${idsCL[Default]}"
 						DIVIDER . green 52
 					fi
-		
-					for NTYPE in "${ntypesel[@]}"; do
-						PH=${NTYPE}_HOSTS[0]
-						PH_CMD="ssh root@${!PH}"
-						var=${NTYPE}_REPL_CHECK[@]
-						if [ ! -z ${!var+x} ]; then
-							var=${NTYPE}_HOSTS[@]
-							for nip in "${!var}"; do
-								echo -e " ${idsCL[LightCyan]}${NM_HOSTNAMES[${!PH}]}[${!PH}] <--> ${idsST[Bold]}${NM_HOSTNAMES[${nip}]}[${nip}]${idsST[Reset]}${idsCL[Default]}"
-								DIVIDER false green
-								if [ ! -f ${NM_FOLDER}/${!PH}.down ] && [ ! -f ${NM_TMPFOLDER}/${nip}.down ]; then
-									var2=${NTYPE}_REPL_CHECK[@]
-									for rcheck in "${!var2}"; do
-										ic=0; cw=${PRI_CW}; spc=''; spc1=${cw}-${#NM_REPL_DESC[${rcheck}]}; until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
-										echo -en " ${NM_REPL_DESC[${rcheck}]}${spc}: "
-										echo -e "${idsCL[LightGreen]}Good${idsCL[Default]}"
-									done
-									echo
-								fi
+					
+					var=${NTYPE}_REPL_CHECK[@]
+					if [ ! -z ${!var+x} ]; then
+						var=${NTYPE}_HOSTS[@]
+						for nip in "${!var}"; do
+							echo -e " ${idsCL[LightCyan]}${NM_HOSTNAMES[${!PH}]}[${!PH}] <--> ${idsST[Bold]}${NM_HOSTNAMES[${nip}]}[${nip}]${idsST[Reset]}${idsCL[Default]}"
+							DIVIDER false green
+							var2=${NTYPE}_REPL_CHECK[@]
+							for rcheck in "${!var2}"; do
+								ic=0; cw=${PRI_CW}; spc=''; spc1=${cw}-${#NM_REPL_DESC[${rcheck}]}; until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
+								echo -en " ${NM_REPL_DESC[${rcheck}]}${spc}: "
+								
+								echo -e "${idsCL[LightGreen]}here${idsCL[Default]}"
 							done
-						fi
-					done
-					echo
+							echo
+						done
+					fi
 				fi
 			done
 		fi