diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 01da28e0..ab1864a5 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -243,7 +243,7 @@ CHECKPOWER(){ echo -en "\r\033[K" AD=$(IDS_NUMBER_FORMAT ${SVRRM_AMP_avg} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done - echo -e "${MSG}${idsCL[LightYellow]}${idsBG[Blue]} ${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_avg} 0`'W ${idsBG[Default]}" + echo -e "${MSG}${idsCL[LightYellow]} ${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_avg} 0`'W" else echo -e "${idsBG[Default]}" fi @@ -267,8 +267,8 @@ CHECKPOWER(){ fi AD=$(IDS_NUMBER_FORMAT ${SVRRM_AMP_WAC} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done - MSG="${idsCL[White]}Server Room Total w/AIR ${idsCL[Default]}: ${idsCL[White]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC} 0`'W " - echo -en "${idsBG[Blue]}${MSG}${idsBG[Default]}" + MSG="${idsBG[Blue]}${idsCL[White]}Server Room Total w/AIR ${idsCL[Default]}: ${idsCL[White]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC} 0`'W ${idsBG[Default]}" + echo -en "${MSG}" if [ "${avgdays}" != "" ]; then echo -en "${idsCL[Yellow]} Calculating Server Room w/AIR Total Averages ... " SVRRM_WAC_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['total-wac']} ${avgdays} both) @@ -277,7 +277,7 @@ CHECKPOWER(){ echo -en "\r\033[K" AD=$(IDS_NUMBER_FORMAT ${SVRRM_AMP_WAC_avg} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done - echo -e "${idsBG[Blue]}${MSG}${idsCL[LightYellow]} ${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC_avg} 0`'W ${idsBG[Default]}" + echo -e "${MSG}${idsCL[LightYellow]} ${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC_avg} 0`'W" else echo -e "${idsBG[Default]}" fi