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

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

diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index bdeb4605..3f17976d 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -315,18 +315,18 @@ CHECKPOWER(){
 							SENSOR_TOTAL_WATTS_OFFSITE=$(expr ${SENSOR_TOTAL_WATTS_OFFSITE} + ${HOST_WATTS})
 							SENSOR_TOTAL_AMPS_OFFSITE=$(echo "scale=1; ${SENSOR_TOTAL_AMPS_OFFSITE}+${HOST_AMPS}" | bc)
 						fi
-						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
+					fi
+					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
-							echo -en "${idsCL[Cyan]}	[PS1=${idsCL[LightCyan]}${PS1}'A${idsCL[Cyan]}, PS2=${idsCL[LightCyan]}${PS2}'A${idsCL[Cyan]}]"
+							AVERAGE_WATTS_OFFSITE=`echo "scale=2; ${AVERAGE_WATTS_OFFSITE}+${average}" | bc`
 						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]}"					
 				fi
@@ -338,7 +338,7 @@ CHECKPOWER(){
 			[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]}		`IDS_NUMBER_FORMAT ${AVERAGE_WATTS_MAINSITE}`'watts" || echo
 		fi
 		if [ "${STYPE}" == "" ] || [ "${STYPE}" == "offsite" ]; then
-			echo -e "${idsCL[LightCyan]}Offsite Total            ${idsCL[Default]}: ${idsCL[LightGreen]}${SENSOR_TOTAL_AMPS_OFFSITE}'amps - `IDS_NUMBER_FORMAT ${SENSOR_TOTAL_WATTS_OFFSITE}`'watts"
+			echo -en "${idsCL[LightCyan]}Offsite Total            ${idsCL[Default]}: ${idsCL[LightGreen]}${SENSOR_TOTAL_AMPS_OFFSITE}'amps - `IDS_NUMBER_FORMAT ${SENSOR_TOTAL_WATTS_OFFSITE}`'watts"
 			[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]}		`IDS_NUMBER_FORMAT ${AVERAGE_WATTS_OFFSITE}`'watts" || echo
 		fi
 	fi