From 96a04747153516515b00b64e5ac5011fd9a409a8 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 11 Feb 2024 09:04:13 -0600 Subject: [PATCH] Update power.inc.sh --- inc/power.inc.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 3c304c5f..9b9b1263 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -218,8 +218,6 @@ CHECKPOWER(){ AD=$(IDS_NUMBER_FORMAT ${NETRK_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done echo -e "${idsCL[White]}Network Rack ${idsCL[Default]}: ${idsCL[Green]}${AD}'amps${spc}${idsCL[Green]}`IDS_NUMBER_FORMAT ${NETRK_WATT} 0`'watts ${idsCL[Default]}" - - DIVIDER . lightCyan ${PRI_WIDTH} if [ "${avgdays}" != "" ]; then echo -en "${idsCL[Yellow]}Calculating Air Conidtioner Averages ... " AIRCON_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['ServerRoom-AC']} ${avgdays} both) @@ -227,11 +225,11 @@ CHECKPOWER(){ AIRCON_WATT_avg=$(echo ${AIRCON_avg} | cut -d'~' -f 2) echo -en "\r\033[K" fi - echo -en "${idsCL[White]}Air Conditioner Amps ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${AIRCON_AMP}`'amps ${idsCL[Default]}" - [ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${AIRCON_AMP_avg}`'amps${idsCL[Default]}" || echo -e "${idsCL[Default]}" - echo -en "${idsCL[White]}Air Conditioner Wattage ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${AIRCON_WATT} 0`'watts ${idsCL[Default]}" - [ "${avgdays}" != "" ] && echo -e "${idsCL[LightYellow]} `IDS_NUMBER_FORMAT ${AIRCON_WATT_avg} 0`'watts${idsCL[Default]}" || echo -e "${idsCL[Default]}" - + AD=$(IDS_NUMBER_FORMAT ${AIRCON_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done + echo -e "${idsCL[White]}Air Conditioner ${idsCL[Default]}: ${idsCL[Green]}${AD}'amps${spc}${idsCL[Green]}`IDS_NUMBER_FORMAT ${AIRCON_WATT} 0`'watts ${idsCL[Default]}" + + + DIVIDER . lightCyan ${PRI_WIDTH} fi if [ "${avgdays}" != "" ]; then