From 78b384964bb23a4cae0c0f208a85e0a8ff0706da Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 11 Feb 2024 09:27:35 -0600 Subject: [PATCH] Update power.inc.sh --- inc/power.inc.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 3f7a3353..ac80a3a6 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -207,7 +207,7 @@ CHECKPOWER(){ 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]}${APCPDU_AMP}'A `IDS_NUMBER_FORMAT ${APCPDU_WATT} 0`'W" - [ "${avgdays}" != "" ] && echo -e " ${APCPDU_AMP_avg}'A `IDS_NUMBER_FORMAT ${APCPDU_WATT_avg} 0`'W" || echo + [ "${avgdays}" != "" ] && echo -e " ${APCPDU_AMP_avg}'A `IDS_NUMBER_FORMAT ${APCPDU_WATT_avg} 0`'W" || echo if [ "${avgdays}" != "" ]; then echo -en "${idsCL[Yellow]}Calculating NetworkRack Averages ... " @@ -218,7 +218,7 @@ CHECKPOWER(){ 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 -en "${idsCL[White]}Network Rack ${idsCL[Default]}: ${idsCL[Green]}${NETRK_AMP}'A `IDS_NUMBER_FORMAT ${NETRK_WATT} 0`'W" - [ "${avgdays}" != "" ] && echo -e " ${NETRK_AMP_avg}'A `IDS_NUMBER_FORMAT ${NETRK_WATT_avg} 0`'W" || echo + [ "${avgdays}" != "" ] && echo -e " ${NETRK_AMP_avg}'A `IDS_NUMBER_FORMAT ${NETRK_WATT_avg} 0`'W" || echo if [ "${avgdays}" != "" ]; then echo -en "${idsCL[Yellow]}Calculating Air Conidtioner Averages ... " @@ -229,7 +229,7 @@ CHECKPOWER(){ 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 -en "${idsCL[White]}Air Conditioner ${idsCL[Default]}: ${idsCL[Green]}${AIRCON_AMP}'A `IDS_NUMBER_FORMAT ${AIRCON_WATT} 0`'W" - [ "${avgdays}" != "" ] && echo -e " ${AIRCON_AMP_avg}'A `IDS_NUMBER_FORMAT ${AIRCON_WATT_avg} 0`'W" || echo + [ "${avgdays}" != "" ] && echo -e " ${AIRCON_AMP_avg}'A `IDS_NUMBER_FORMAT ${AIRCON_WATT_avg} 0`'W" || echo DIVIDER . lightCyan ${PRI_WIDTH} if [ "${avgdays}" != "" ]; then @@ -244,11 +244,11 @@ CHECKPOWER(){ 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 -en "${idsCL[White]}Server Room ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP}'A `IDS_NUMBER_FORMAT ${SVRRM_WATT} 0`'W" - [ "${avgdays}" != "" ] && echo -e " ${SVRRM_AMP_avg}'A `IDS_NUMBER_FORMAT ${SVRRM_WATT_avg} 0`'W" || echo + [ "${avgdays}" != "" ] && echo -e " ${SVRRM_AMP_avg}'A `IDS_NUMBER_FORMAT ${SVRRM_WATT_avg} 0`'W" || echo # 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 -en "${idsCL[White]}Server Room w/AIR ${idsCL[Default]}: ${idsCL[Green]}${SVRRM_AMP_WAC}'A `IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC} 0`'W" - [ "${avgdays}" != "" ] && echo -e " ${SVRRM_AMP_WAC_avg}'A `IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC_avg} 0`'W" || echo + [ "${avgdays}" != "" ] && echo -e " ${SVRRM_AMP_WAC_avg}'A `IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC_avg} 0`'W" || echo DIVIDER . lightCyan ${PRI_WIDTH} fi