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

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

diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh
index fb71a4f7..f6add8bd 100755
--- a/nodemgmt-scripts.sh
+++ b/nodemgmt-scripts.sh
@@ -357,7 +357,7 @@ NODEUPDATE(){
 	NODE="${NM_HOSTNAMES[${nip}]} [${nip}]"
 	
 	if [ ${noup} -eq 0 ]; then
-		c=0; spca=''; spc1=${cw}-${#NODE}; until [ $c = ${spc1} ]; do spca="${spca} "; c=`expr $c + 1`; done
+		c=0; spca=''; spc1=`expr ${cw} - ${#NODE}`; until [ $c = ${spc1} ]; do spca="${spca} "; c=`expr $c + 1`; done
 		echo -en "Updating ${NODE}${spca}"
 	fi
 	betacheck=$(BETACHECK)
@@ -687,12 +687,9 @@ DOWNLIST(){
 					toterrtime=$(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${ditem}.down))
 				fi
 		
-				c=0; spc=''; spc1=${cw}-${#itemname}
-				until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
-				c=0; spca=''; spc1=${cw1}-${#itemtype}
-				until [ $c = ${spc1} ]; do spca="${spca} "; c=`expr $c + 1`; done
-				c=0; spc2=''; spc1=${cw2}-${#host}
-				until [ $c = ${spc1} ]; do spc2="${spc2} "; c=`expr $c + 1`; done
+				c=0; spc=''; spc1=`expr ${cw} - ${#itemname}`; until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
+				c=0; spca=''; spc1=`expr ${cw} - ${#itemtype}`; until [ $c = ${spc1} ]; do spca="${spca} "; c=`expr $c + 1`; done
+				c=0; spc2=''; spc1=`expr ${cw} - ${#host}`; until [ $c = ${spc1} ]; do spc2="${spc2} "; c=`expr $c + 1`; done
 				time=$(SHOW_TIME ${toterrtime})
 				if [ "${1}" == "report" ]; then
 					echo -e "${idsCL[LightRed]}${itemtype}${spca}${itemname}${spc}${host}${spc2}${time}${idsCL[Default]}"
@@ -784,7 +781,7 @@ MAINTENANCE_MODE(){
 				
 					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
-						c=0; cw=${PRI_CW}; spc=''; spc1=${cw}-${#NM_SERVICE_DESC[${srvc}]}; until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
+						c=0; spc=''; spc1=`expr ${PRI_CW} - ${#NM_SERVICE_DESC[${srvc}]}`; until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
 						echo -en "${isel} ${idsCL[White]}${NM_SERVICE_DESC[${srvc}]}${spc}${idsCL[Default]}: "
 						
 						echo -e "${idsCL[LightGreen]}here${idsCL[Default]}"
@@ -803,7 +800,7 @@ MAINTENANCE_MODE(){
 					
 					for docker in "${!dockers}"; do
 						if [ ${item_number} -lt 10 ]; then isel="  ${item_number})"; elif [ ${item_number} -lt 100 ]; then isel=" ${item_number})"; else isel="${item_number})"; fi
-						c=0; cw=${PRI_CW}; spc=''; spc1=`expr ${cw} - ${#NM_DOCKER_DESC[${docker}]}`; until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
+						c=0; spc=''; spc1=`expr ${PRI_CW} - ${#NM_DOCKER_DESC[${docker}]}`; until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
 						echo -en "${isel} ${idsCL[White]}${NM_DOCKER_DESC[${docker}]}$spc${idsCL[Default]}: "
 						
 						echo -e "${idsCL[LightGreen]}here${idsCL[Default]}"
@@ -835,7 +832,7 @@ MAINTENANCE_MODE(){
 					DIVIDER false green
 					for rcheck in "${!repls}"; do
 						if [ ${item_number} -lt 10 ]; then isel="  ${item_number})"; elif [ ${item_number} -lt 100 ]; then isel=" ${item_number})"; else isel="${item_number})"; fi
-						ic=0; cw=${PRI_CW}; spc=''; spc1=${cw}-${#NM_REPL_DESC[${rcheck}]}; until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
+						c=0; spc=''; spc1=`expr ${PRI_CW} - ${#NM_REPL_DESC[${rcheck}]}`; until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
 						echo -en "${isel} ${idsCL[White]}${NM_REPL_DESC[${rcheck}]}${spc}${idsCL[Default]}: "
 
 						echo -e "${idsCL[LightGreen]}here${idsCL[Default]}"