From 10d8525e99ef913e2ea30bf679bda84e806280f3 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 9 Dec 2023 17:53:31 -0600
Subject: [PATCH] Update powerwall.sh

---
 powerwall.sh | 42 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/powerwall.sh b/powerwall.sh
index 05d185ad..7f238786 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -1456,19 +1456,19 @@ SHUTDOWN_SERVER(){
 	else
 		ESXIHOST=''
 	fi	
-	echo -e "\n${idsCL[Yellow]}ESXi Host Powerdown"
-	DIVIDER . yellow 75
+	# echo -e "\n${idsCL[Yellow]}ESXi Host Powerdown"
+	# DIVIDER . yellow 75
 	
 	
 	if [ "${ESXIHOST}" != "" ]; then
 		host=${PW_ESXI_HOST_NAMES[${ESXIHOST}]}
-		c=0; spcA=''; spc1=`expr 21 - ${#host} - 1`; until [ ${c} = ${spc1} ]; do spcA="${spcA} "; c=`expr ${c} + 1`; done
-		c=0; spcB=''; spc1=`expr 18 - ${#ESXIHOST} - 1`; until [ ${c} = ${spc1} ]; do spcB="${spcB} "; c=`expr ${c} + 1`; done
-		echo -en "${idsCL[LightCyan]} Host: ${idsCL[Green]}${host}${spcA}"
-		echo -en "${idsCL[LightCyan]}Host IP: ${idsCL[Green]}${ESXIHOST}${spcB}"
-		echo -e "${idsCL[LightCyan]}iDrac IP: ${idsCL[Green]}${PW_HOST_IDRACS[${host}]}${idsCL[Default]}"
-		DIVIDER . yellow 75
-		echo	
+		# c=0; spcA=''; spc1=`expr 21 - ${#host} - 1`; until [ ${c} = ${spc1} ]; do spcA="${spcA} "; c=`expr ${c} + 1`; done
+		# c=0; spcB=''; spc1=`expr 18 - ${#ESXIHOST} - 1`; until [ ${c} = ${spc1} ]; do spcB="${spcB} "; c=`expr ${c} + 1`; done
+		# echo -en "${idsCL[LightCyan]} Host: ${idsCL[Green]}${host}${spcA}"
+		# echo -en "${idsCL[LightCyan]}Host IP: ${idsCL[Green]}${ESXIHOST}${spcB}"
+		# echo -e "${idsCL[LightCyan]}iDrac IP: ${idsCL[Green]}${PW_HOST_IDRACS[${host}]}${idsCL[Default]}"
+		# DIVIDER . yellow 75
+		# echo
 	
 		echo "($(date +'%Y-%m-%d %H:%M:%S')) - Shutting down ${host} (${ESXIHOST})" >> ${PW_LOGFILE}
 		
@@ -1583,7 +1583,13 @@ HOSTMGMT(){
 	([ "${HOST}" == "" ] || ([ "${POWER}" == "" ] && [ "${ESXI}" == "" ])) && echo -e "Invalid command arguments\n" && exit 1
 	
 	if [ "${MODE}" == "esxi" ]; then
-		([ "${ESXI}" == "maint" ] || [ "${ESXI}" == "maintenance" ] || [ "${ESXI}" == "mm" ]) && SHUTDOWN_SERVER ${HOST} maintenance || SHUTDOWN_SERVER ${HOST}
+		if [ "${ESXI}" == "maint" ] || [ "${ESXI}" == "maintenance" ] || [ "${ESXI}" == "mm" ]; then
+			echo -e "${idsCL[LightGreen]}PUTTING HOST INTO MAINTENANCE MODE${idsCL[Default]}\n"
+			SHUTDOWN_SERVER ${HOST} maintenance
+		else
+			echo -e "${idsCL[LightGreen]}SHUTTING DOWN HOST${idsCL[Default]}\n"
+			SHUTDOWN_SERVER ${HOST}
+		fi
 		
 	elif [ "${MODE}" == "power" ]; then
 		HOSTPOWER ${HOST} ${POWER}
@@ -1631,14 +1637,14 @@ HOSTPOWER(){
 	fi
 	
 	if [ "${idracip}" != "" ]; then
-		host=${PW_iDRACHOST_SHORTNAMES[${idracip}]}
-		c=0; spcA=''; spc1=`expr 21 - ${#host} - 1`; until [ ${c} = ${spc1} ]; do spcA="${spcA} "; c=`expr ${c} + 1`; done
-		c=0; spcB=''; spc1=`expr 18 - ${#PW_HOST_ADDRESSES[${host}]} - 1`; until [ ${c} = ${spc1} ]; do spcB="${spcB} "; c=`expr ${c} + 1`; done
-		echo -en "${idsCL[LightCyan]} Host: ${idsCL[Green]}${host}${spcA}"
-		echo -en "${idsCL[LightCyan]}Host IP: ${idsCL[Green]}${PW_HOST_ADDRESSES[${host}]}${spcB}"
-		echo -e "${idsCL[LightCyan]}iDrac IP: ${idsCL[Green]}${idracip}${idsCL[Default]}"
-		DIVIDER . yellow 75
-		echo
+		# host=${PW_iDRACHOST_SHORTNAMES[${idracip}]}
+		# c=0; spcA=''; spc1=`expr 21 - ${#host} - 1`; until [ ${c} = ${spc1} ]; do spcA="${spcA} "; c=`expr ${c} + 1`; done
+		# c=0; spcB=''; spc1=`expr 18 - ${#PW_HOST_ADDRESSES[${host}]} - 1`; until [ ${c} = ${spc1} ]; do spcB="${spcB} "; c=`expr ${c} + 1`; done
+		# echo -en "${idsCL[LightCyan]} Host: ${idsCL[Green]}${host}${spcA}"
+		# echo -en "${idsCL[LightCyan]}Host IP: ${idsCL[Green]}${PW_HOST_ADDRESSES[${host}]}${spcB}"
+		# echo -e "${idsCL[LightCyan]}iDrac IP: ${idsCL[Green]}${idracip}${idsCL[Default]}"
+		# DIVIDER . yellow 75
+		# echo
 		
 		if [ "${2^^}" == "ON" ] || [ "${2^^}" == "OFF" ] || [ "${2^^}" == "STATUS" ]; then
 			if [ "${idracip}" == "10.10.2.20" ] && [ "${2^^}" == "ON" ]; then