From 78434948798e175fef70e9e726dd2aa3b5263404 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 27 Jul 2024 13:11:48 -0500
Subject: [PATCH] Update power.inc.sh

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

diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index d2fee338..e4572a5d 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -459,8 +459,8 @@ CHECKPOWER(){
 							[ "${PS1}" != "0.0" ] && PS1=`echo "scale=1; ${PS1}/10" | bc` && (( $(bc <<<"${PS1} < 1") )) && [[ "${PS1}" = *"."* ]] && PS1="0${PS1}"
 							[ "${PS2}" != "0.0" ] && PS2=`echo "scale=1; ${PS2}/10" | bc` && (( $(bc <<<"${PS2} < 1") )) && [[ "${PS2}" = *"."* ]] && PS2="0${PS2}"
 							HOST_AMPS=`echo "scale=1; ${PS1}+${PS2}" | bc`
-							AD=${HOST_AMPS}; c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
-							HOST_WATTS_disp="${idsCL[Green]}`IDS_NUMBER_FORMAT ${AD} 1 true`'A${spc}`IDS_NUMBER_FORMAT ${HOST_WATTS} 0`'W"
+							AD=$(IDS_NUMBER_FORMAT ${HOST_AMPS} 1 true); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
+							HOST_WATTS_disp="${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${HOST_WATTS} 0`'W"
 							
 						elif [ "$(ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSOR}]} -U ${PW_ESXI_USER} -P "${ESXI_PASS}" chassis power status | grep off)" != "" ]; then
 							HOST_WATTS_disp="${idsCL[LightRed]}Host powered down"
@@ -529,16 +529,16 @@ CHECKPOWER(){
 		[ "${avgdays}" != "" ] && echo -e "		Amps        Watts" || echo
 		DIVIDER . lightCyan ${PRI_WIDTH}
 		if [ "${STYPE}" = "" ] || [ "${STYPE}" = "mainsite" ]; then
-			AD=${SENSOR_TOTAL_AMPS_MAINSITE}; c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
+			AD=`IDS_NUMBER_FORMAT ${SENSOR_TOTAL_AMPS_MAINSITE} 1 true`; c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
 			echo -en "${idsCL[LightCyan]}Mainsite ESXi Total      ${idsCL[Default]}: ${idsCL[LightGreen]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${SENSOR_TOTAL_WATTS_MAINSITE} 0`'W "
-			AD=${AVERAGE_AMPS_MAINSITE}; c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
-			[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]}		`IDS_NUMBER_FORMAT ${AD} 1 true`'A${spc}`IDS_NUMBER_FORMAT ${AVERAGE_WATTS_MAINSITE} 0`'W" || echo
+			AD=`IDS_NUMBER_FORMAT ${AVERAGE_AMPS_MAINSITE} 1 true`; c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
+			[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]}		${AD}'A${spc}`IDS_NUMBER_FORMAT ${AVERAGE_WATTS_MAINSITE} 0`'W" || echo
 		fi
 		if [ "${STYPE}" = "" ] || [ "${STYPE}" = "offsite" ]; then
-			AD=${SENSOR_TOTAL_AMPS_OFFSITE}; c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
+			AD=`IDS_NUMBER_FORMAT ${SENSOR_TOTAL_AMPS_OFFSITE} 1 true`; c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
 			echo -en "${idsCL[LightCyan]}Offsite ESXi Total       ${idsCL[Default]}: ${idsCL[LightGreen]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${SENSOR_TOTAL_WATTS_OFFSITE} 0`'W   "
 			AD=${AVERAGE_AMPS_OFFSITE}; c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done
-			[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]}		`IDS_NUMBER_FORMAT ${AD} 1 true`'A${spc}`IDS_NUMBER_FORMAT ${AVERAGE_WATTS_OFFSITE} 0`'W" || echo
+			[ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]}		${AD}'A${spc}`IDS_NUMBER_FORMAT ${AVERAGE_WATTS_OFFSITE} 0`'W" || echo
 		fi
 	fi
 	if [ ${REPORT} -eq 0 ]; then