From 0d6abdfdbfde74b35d19ae85f2b2d7415a7b87be Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 11 Feb 2024 11:42:07 -0600 Subject: [PATCH] Update power.inc.sh --- inc/power.inc.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 3c9a8250..80fa9909 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -400,7 +400,7 @@ 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 + AD=${HOST_AMPS}; c=0; spc=''; spc1=`expr ${wspc} - ${#AD} - 3`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done HOST_WATTS_disp="${idsCL[Green]}${AD}'amps${spc}`IDS_NUMBER_FORMAT ${HOST_WATTS} 0`'watts" elif [ "$(ipmitool -I lanplus -H ${PW_HOST_IDRACS[${SENSOR}]} -U ${PW_ESXI_USER} -P "${PW_ESXI_PASS}" chassis power status | grep off)" != "" ]; then @@ -420,7 +420,7 @@ CHECKPOWER(){ fi [ ${REPORT} -eq 0 ] && echo -en "\r\033[K" - MSG="${idsCL[White]}${SENSOR} ${idsCL[Default]}: ${HOST_WATTS_disp}" + MSG="${idsCL[White]}${SENSOR} ${idsCL[Default]}: ${HOST_WATTS_disp}" echo -en "${MSG}" if [ "${avgdays}" != "" ] && [ ${HOST_WATTS} -ne -2 ] && [ "${SENSOR}" != "iDS-vMS-Host6" ]; then @@ -429,7 +429,7 @@ CHECKPOWER(){ average=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${SENSOR}]} ${avgdays} both) average_amp=$(echo ${average} | cut -d'~' -f 1) average_watt=$(echo ${average} | cut -d'~' -f 2) - AD=${average_amp}; c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done + AD=${average_amp}; c=0; spc=''; spc1=`expr ${wspc} - ${#AD} - 3`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done average_disp=" ${AD}'amps${spc}`IDS_NUMBER_FORMAT ${average_watt} 0`'watts" echo -en "\r\033[K" echo -e "${MSG}${idsCL[LightYellow]}${average_disp}${idsCL[Default]}"