From a81bf30ab246842b8db2eaaac8fc3a62d6ffda9b Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Mon, 11 Dec 2023 22:42:58 -0600
Subject: [PATCH] Update powerwall.sh

---
 powerwall.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/powerwall.sh b/powerwall.sh
index d539439c..b2fdbe26 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # powerwall - CLI commands to control VM guest power
 
-action="${1}"
+PW_ACTION="${1}"
 
 source /opt/idssys/defaults/colors.inc
 source /opt/idssys/defaults/default.inc
@@ -86,6 +86,7 @@ CHECKTEMP(){
 					# 	touch ${PW_TMPFOLDER}/${EHOST}.down
 					# fi
 				fi
+				echo
 				
 			elif [ "${PW_SENSOR_TYPE[${SENSOR}]}" != "esxi" ] && [ "${temptype}" != "esxi" ]; then
 				[[ "${SENSOR}" == *"CPU-Usage"* ]] && echo -en "\033[1A"
@@ -94,12 +95,12 @@ CHECKTEMP(){
 				[ "${avgdays}" != "noavg" ] && echo -en "Pulling data and calculating ${avgdays} Day average ... " || echo -en "Pulling data ... "
 				reading=$(CHECKTEMPSENSOR ${SENSOR} . . . . ${avgdays})
 				echo -e "\r\033[K${idsCL[White]}${idsST[Bold]}${SENSOR}${idsST[Reset]}${spc}${idsCL[Default]}: ${reading}"
+				echo
 			fi
-			echo
 		fi
 	done
 	end=`date +%s`; runtime=$((end-start)); echo -e "\nruntime: ${runtime}"
-	[ "${action}" != "" ] && echo
+	[ "${PW_ACTION}" != "" ] && echo
 }
 
 CHECKTEMPSENSOR(){
@@ -841,7 +842,7 @@ CHECKPOWER(){
 		
 	
 	end=`date +%s`; runtime=$((end-start)); echo -e "\nruntime: ${runtime}"
-	[ "${action}" != "" ] && echo
+	[ "${PW_ACTION}" != "" ] && echo
 }
 		
 CHECKPOWER_SERVICE(){
@@ -2295,8 +2296,8 @@ if [[ "${1}" != *"_service" ]] && [[ "${noheader}" != *" ${1} "* ]] && [[ "${noh
 	echo -e "${idsCL[LightGreen]}${msg}${spc}${idsCL[LightGreen]}|${idsCL[Default]}"
 	DIVIDER . lightGreen 70
 fi
-# if [ ${action-x} ]; then
-	case ${action} in
+# if [ ${PW_ACTION-x} ]; then
+	case ${PW_ACTION} in
 		services)
 			[ "${2}" == "stop" ] && STOPALL_SERVICES
 			[ "${2}" == "start" ] && STARTALL_SERVICES