diff --git a/inc/power.inc.bak.sh b/inc/power.inc.bak.sh index 2ee19924..ccb7894b 100644 --- a/inc/power.inc.bak.sh +++ b/inc/power.inc.bak.sh @@ -222,7 +222,7 @@ CHECKPOWER(){ DIVIDER . lightCyan ${PRI_WIDTH} if [ "${avgdays}" != "" ]; then - echo -en "${idsCL[Yellow]}Calculating Air Conidtioner Averages ... " + echo -en "${idsCL[Yellow]}Calculating Air Conditioner Averages ... " AIRCON_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['ServerRoom-AC']} ${avgdays} both) AIRCON_AMP_avg=$(echo ${AIRCON_avg} | cut -d'~' -f 1) AIRCON_WATT_avg=$(echo ${AIRCON_avg} | cut -d'~' -f 2) diff --git a/inc/power.inc.sh b/inc/power.inc.sh index b998322b..5b62c03c 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -253,10 +253,10 @@ CHECKPOWER(){ DIVIDER . lightCyan ${PRI_WIDTH} AD=$(IDS_NUMBER_FORMAT ${AIRCON_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done - MSG="${idsBG[Blue]}${idsCL[White]}Air Conditioner ${idsCL[Default]}: ${idsCL[White]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${AIRCON_WATT} 0`'W${idsBG[Default]}" + MSG="${idsCL[White]}Air Conditioner ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${AIRCON_WATT} 0`'W" echo -en "${MSG}" if [ "${avgdays}" != "" ]; then - echo -en "${idsCL[Yellow]} Calculating Air Conidtioner Averages ... " + echo -en "${idsCL[Yellow]} Calculating Air Conditioner Averages ... " AIRCON_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['ServerRoom-AC']} ${avgdays} both) AIRCON_AMP_avg=$(echo ${AIRCON_avg} | cut -d'~' -f 1) AIRCON_WATT_avg=$(echo ${AIRCON_avg} | cut -d'~' -f 2) @@ -271,17 +271,17 @@ CHECKPOWER(){ DIVIDER . cyan ${PRI_WIDTH} 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[LightCyan]}Server Room Total w/AIR ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC} 0`'W" + 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 ... " + echo -en " ${idsBG[Default]}${idsCL[Yellow]}Calculating Server Room w/AIR Total Averages ... " SVRRM_WAC_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['total-wac']} ${avgdays} both) SVRRM_AMP_WAC_avg=$(echo ${SVRRM_WAC_avg} | cut -d'~' -f 1) SVRRM_WATT_WAC_avg=$(echo ${SVRRM_WAC_avg} | cut -d'~' -f 2) 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} ${idsBG[Default]}${idsCL[LightYellow]} ${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC_avg} 0`'W" else echo fi