From 5925b236e28713f6e511e427cd981a464033022b Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 4 Nov 2023 12:57:31 -0500
Subject: [PATCH] Update powerwall.sh

---
 powerwall.sh | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/powerwall.sh b/powerwall.sh
index 75bb81d5..c48e6d35 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -33,7 +33,6 @@ CHECKTEMP(){
 		if [ "${1}" == "" ] || [[ "${SENSOR}" = *"${1}"* ]] || [ "${1}" == "noavg" ] || [[ "${1}" =~ ^[0-9]+$ ]]; then
 			
 			if [ "${PW_SENSOR_TYPE[${SENSOR}]}" == "esxi" ]; then
-				[ "${RACADMONLINE}" == "ns" ] && RACADMONLINE=$(CHECK_HOST ${PW_RACADM_ACCESS})
 				vHOSTiDRACIP=${PW_HOST_IDRACS[${SENSOR}]}
 				vHOSTIP=${PW_HOST_ADDRESSES[${SENSOR}]}				
 				vHOSTNAME=${PW_ESXI_HOST_NAMES[${vHOSTiDRACIP}]}
@@ -221,8 +220,7 @@ CHECKTEMP_SERVICE(){
 					rm -f ${PW_TMPFOLDER}/${SENSORa}.down
 				
 				fi
-				[ "${PW_SENSOR_TYPE[${SENSORa}]}" == "esxi" ] && [ "${RACADMONLINE}" == "ns" ] && RACADMONLINE=$(CHECK_HOST ${PW_RACADM_ACCESS})
-				if [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "esxi" ] && [ "${RACADMONLINE}" != "false" ]; then
+				if [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "esxi" ]; then
 					vHOST_TEMPNAMES=$(snmpwalk -v 1 -c public -t 2 ${vHOSTiDRACIP} .1.3.6.1.4.1.674.10892.5.4.700.20.1.8 -O vq | sed -e 's/"//g' | sed -e 's/ Temp//g')
 					unset IFS; IFS=$'\n' read -rd '' -a SENSORS_CHECK <<<"${vHOST_TEMPNAMES}"; unset IFS
 					
@@ -240,9 +238,6 @@ CHECKTEMP_SERVICE(){
 						fi
 					fi
 					
-				elif [ "${RACADMONLINE}" == "false" ]; then
-					SENSORS_CHECK=''
-					
 				else
 					SENSORS_CHECK=(${SENSORa})
 				fi
@@ -460,12 +455,9 @@ DAILYTEMP(){
 	echo -e "Sensor Temperature(s)              Now / 1DayAVG / 7DayAVG"
 	DIVIDER . . 60
 	for SENSORa in ${PW_SENSOR_ORD[@]}; do
-		[ "${PW_SENSOR_TYPE[${SENSORa}]}" == "esxi" ] && [ "${RACADMONLINE}" == "ns" ] && RACADMONLINE=$(CHECK_HOST ${PW_RACADM_ACCESS})
-		if [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "esxi" ] && [ "${RACADMONLINE}" != "false" ]; then
-			vHOST_TEMPNAMES=$(snmpwalk -v 1 -c public -t 2 ${vHOSTiDRACIP} .1.3.6.1.4.1.674.10892.5.4.700.20.1.8 -O vq | sed -e 's/"//g' | sed -e 's/ Temp//g')
+		if [ "${PW_SENSOR_TYPE[${SENSORa}]}" == "esxi" ]; then
+			vHOST_TEMPNAMES=$(snmpwalk -v 1 -c public -t 2 ${PW_HOST_IDRACS[${SENSORa}]} .1.3.6.1.4.1.674.10892.5.4.700.20.1.8 -O vq | sed -e 's/"//g' | sed -e 's/ Temp//g')
 			unset IFS; IFS=$'\n' read -rd '' -a SENSORS_CHECK <<<"${vHOST_TEMPNAMES}"; unset IFS
-		elif [ "${RACADMONLINE}" == "false" ]; then
-			SENSORS_CHECK=''
 		else
 			SENSORS_CHECK=(${SENSORa})
 		fi