diff --git a/inc/power.inc.sh b/inc/power.inc.sh index c3dd45c3..e95d52d2 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -205,9 +205,9 @@ CHECKPOWER(){ APCPDU_WATT_avg=$(echo ${APCPDU_avg} | cut -d'~' -f 2) 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 + 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 " ${AD}'A${spc}`IDS_NUMBER_FORMAT ${APCPDU_WATT_avg} 0`'W" || echo if [ "${avgdays}" != "" ]; then echo -en "${idsCL[Yellow]}Calculating NetworkRack Averages ... " @@ -216,9 +216,9 @@ CHECKPOWER(){ NETRK_WATT_avg=$(echo ${NETRK_avg} | cut -d'~' -f 2) 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 + 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 " ${AD}'A${spc}`IDS_NUMBER_FORMAT ${NETRK_WATT_avg} 0`'W" || echo if [ "${avgdays}" != "" ]; then echo -en "${idsCL[Yellow]}Calculating Air Conidtioner Averages ... " @@ -227,9 +227,9 @@ CHECKPOWER(){ AIRCON_WATT_avg=$(echo ${AIRCON_avg} | cut -d'~' -f 2) 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 + 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 " ${AD}'A${spc}`IDS_NUMBER_FORMAT ${AIRCON_WATT_avg} 0`'W" || echo DIVIDER . lightCyan ${PRI_WIDTH} if [ "${avgdays}" != "" ]; then