From c55d855499dd6f2b412029f835a560a6e82b2fec Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Fri, 12 Jan 2024 08:22:18 -0600
Subject: [PATCH] Update power.inc.sh

---
 inc/power.inc.sh | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index 124aa4f4..9681b8e0 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -316,19 +316,21 @@ CHECKPOWER(){
 							SENSOR_TOTAL_AMPS_OFFSITE=$(echo "scale=1; ${SENSOR_TOTAL_AMPS_OFFSITE}+${HOST_AMPS}" | bc)
 						fi
 					fi
-					if [ "${avgdays}" != "" ] && [ ${HOST_WATTS} -ne 0 ]; then
-						echo -en "${idsCL[LightYellow]}		Calculating average ...${idsCL[Default]}"
-						average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${SENSOR}]} ${avgdays}); average_disp="${idsCL[LightYellow]}		`IDS_NUMBER_FORMAT ${average} 2`'watts"
-						echo -en "\r\033[K"; echo -en "${MSG}${idsCL[LightYellow]}${average_disp}"
-						if [[ "${PW_MAINSITE_HOSTS}" = *"${PW_HOST_ADDRESSES[${SENSOR}]}"* ]]; then
-							AVERAGE_WATTS_MAINSITE=`echo "scale=2; ${AVERAGE_WATTS_MAINSITE}+${average}" | bc`
+					if [ ${HOST_WATTS} -ne 0 ]; then
+						if [ "${avgdays}" != "" ]; then
+							echo -en "${idsCL[LightYellow]}		Calculating average ...${idsCL[Default]}"
+							average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${SENSOR}]} ${avgdays}); average_disp="${idsCL[LightYellow]}		`IDS_NUMBER_FORMAT ${average} 2`'watts"
+							echo -en "\r\033[K"; echo -en "${MSG}${idsCL[LightYellow]}${average_disp}"
+							if [[ "${PW_MAINSITE_HOSTS}" = *"${PW_HOST_ADDRESSES[${SENSOR}]}"* ]]; then
+								AVERAGE_WATTS_MAINSITE=`echo "scale=2; ${AVERAGE_WATTS_MAINSITE}+${average}" | bc`
+							else
+								AVERAGE_WATTS_OFFSITE=`echo "scale=2; ${AVERAGE_WATTS_OFFSITE}+${average}" | bc`
+							fi
 						else
-							AVERAGE_WATTS_OFFSITE=`echo "scale=2; ${AVERAGE_WATTS_OFFSITE}+${average}" | bc`
+							echo -en "${idsCL[Cyan]}	[PS1=${idsCL[LightCyan]}${PS1}'A${idsCL[Cyan]}, PS2=${idsCL[LightCyan]}${PS2}'A${idsCL[Cyan]}]"
 						fi
-					else
-						echo -en "${idsCL[Cyan]}	[PS1=${idsCL[LightCyan]}${PS1}'A${idsCL[Cyan]}, PS2=${idsCL[LightCyan]}${PS2}'A${idsCL[Cyan]}]"
 					fi
-					echo -e "${idsCL[Default]}"					
+					echo -e "${idsCL[Default]}"	
 				fi
 			fi
 		done