From b2f03394813e73780a263f883d943c6eccca6255 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 11 Feb 2024 09:21:05 -0600 Subject: [PATCH] Update power.inc.sh --- inc/power.inc.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 5f96762d..6deb73e4 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -206,8 +206,8 @@ CHECKPOWER(){ echo -en "\r\033[K" fi # AD=$(IDS_NUMBER_FORMAT ${APCPDU_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done - echo -en "${idsCL[White]}Server Rack ${idsCL[Default]}: ${idsCL[Green]}${AD}'A ${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_WATT} 0`'W ${idsCL[Default]}" - [ "${avgdays}" != "" ] && echo -e " " + echo -en "${idsCL[White]}Server Rack ${idsCL[Default]}: ${idsCL[Green]}${APCPDU_AMP}'A ${idsCL[Green]}`IDS_NUMBER_FORMAT ${APCPDU_WATT} 0`'W ${idsCL[Default]}" + [ "${avgdays}" != "" ] && echo -e " " || echo if [ "${avgdays}" != "" ]; then echo -en "${idsCL[Yellow]}Calculating NetworkRack Averages ... " @@ -217,7 +217,7 @@ CHECKPOWER(){ echo -en "\r\033[K" fi # 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}'A ${idsCL[Green]}`IDS_NUMBER_FORMAT ${NETRK_WATT} 0`'W ${idsCL[Default]}" + echo -e "${idsCL[White]}Network Rack ${idsCL[Default]}: ${idsCL[Green]}${NETRK_AMP}'A ${idsCL[Green]}`IDS_NUMBER_FORMAT ${NETRK_WATT} 0`'W ${idsCL[Default]}" if [ "${avgdays}" != "" ]; then echo -en "${idsCL[Yellow]}Calculating Air Conidtioner Averages ... " @@ -227,7 +227,7 @@ CHECKPOWER(){ echo -en "\r\033[K" fi # 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}'A ${idsCL[Green]}`IDS_NUMBER_FORMAT ${AIRCON_WATT} 0`'W ${idsCL[Default]}" + echo -e "${idsCL[White]}Air Conditioner ${idsCL[Default]}: ${idsCL[Green]}${AIRCON_AMP}'A ${idsCL[Green]}`IDS_NUMBER_FORMAT ${AIRCON_WATT} 0`'W ${idsCL[Default]}" DIVIDER . lightCyan ${PRI_WIDTH} if [ "${avgdays}" != "" ]; then @@ -241,9 +241,9 @@ CHECKPOWER(){ echo -en "\r\033[K" fi # AD=$(IDS_NUMBER_FORMAT ${SVRRM_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done - echo -e "${idsCL[White]}Server Room ${idsCL[Default]}: ${idsCL[Green]}${AD}'A ${idsCL[Green]}`IDS_NUMBER_FORMAT ${SVRRM_WATT} 0`'W ${idsCL[Default]}" + echo -e "${idsCL[White]}Server Room ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP}'A ${idsCL[Green]}`IDS_NUMBER_FORMAT ${SVRRM_WATT} 0`'W ${idsCL[Default]}" # AD=$(IDS_NUMBER_FORMAT ${SVRRM_AMP_WAC} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done - echo -e "${idsCL[White]}Server Room w/AIR ${idsCL[Default]}: ${idsCL[Green]}${AD}'A ${idsCL[Green]}`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC} 0`'W ${idsCL[Default]}" + echo -e "${idsCL[White]}Server Room w/AIR ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP_WAC}'A ${idsCL[Green]}`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC} 0`'W ${idsCL[Default]}" DIVIDER . lightCyan ${PRI_WIDTH} fi