diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 54c2a15e..199664ba 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -233,7 +233,7 @@ 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 - MSG="${idsBG[Blue]}${idsCL[White]}Equipment Subtotal ${idsCL[Default]}: ${idsCL[White]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT} 0`'W ${idsBG[Default]}" + MSG="${idsBG[Blue]}${idsCL[White]}Equipment Subtotal ${idsCL[Default]}: ${idsCL[White]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT} 0`'W " echo -en "${MSG}" if [ "${avgdays}" != "" ]; then echo -en "${idsCL[Yellow]} Calculating Equipment Subtotal Averages ... " @@ -243,9 +243,9 @@ 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]} ${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_avg} 0`'W" + echo -e "${MSG}${idsCL[LightYellow]} ${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_avg} 0`'W ${idsBG[Default]}" else - echo + echo -e "${idsBG[Default]}" fi DIVIDER . lightCyan ${PRI_WIDTH} @@ -267,7 +267,7 @@ 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="${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]}" + 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 " echo -en "${MSG}" if [ "${avgdays}" != "" ]; then echo -en "${idsCL[Yellow]} Calculating Server Room w/AIR Total Averages ... " @@ -277,9 +277,9 @@ 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 "${MSG}${idsCL[LightYellow]} ${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC_avg} 0`'W" + echo -e "${MSG}${idsCL[LightYellow]} ${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC_avg} 0`'W ${idsBG[Default]}" else - echo + echo -e "${idsBG[Default]}" fi DIVIDER . lightCyan ${PRI_WIDTH}