diff --git a/inc/power.inc.sh b/inc/power.inc.sh index e5144022..287626a3 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -205,7 +205,7 @@ CHECKPOWER(){ if [ ${REPORT} -eq 0 ]; then echo -en "\r\033[K" AD=$(IDS_NUMBER_FORMAT ${NETRK_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done - MSG="${idsCL[White]}Network Rack ~est~ ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${NETRK_WATT} 0`'W" + MSG="${idsCL[White]}Network Rack ~est~ ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${NETRK_WATT} 1 yes`'W" echo -en "${MSG}" if [ "${avgdays}" != "" ]; then echo -en "${idsCL[Yellow]} Calculating NetworkRack Averages ... " @@ -215,13 +215,13 @@ CHECKPOWER(){ echo -en "\r\033[K" AD=$(IDS_NUMBER_FORMAT ${NETRK_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 ${NETRK_WATT_avg} 0`'W" + echo -e "${MSG}${idsCL[LightYellow]} ${AD}'A${spc}`IDS_NUMBER_FORMAT ${NETRK_WATT_avg} 1 yes`'W" else echo fi AD=$(IDS_NUMBER_FORMAT ${APCPDU_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done - MSG="${idsCL[White]}Server Rack ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${APCPDU_WATT} 0`'W" + MSG="${idsCL[White]}Server Rack ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${APCPDU_WATT} 1 yes`'W" echo -en "${MSG}" if [ "${avgdays}" != "" ]; then echo -en "${idsCL[Yellow]} Calculating Server Rack Averages ... " @@ -231,13 +231,13 @@ CHECKPOWER(){ echo -en "\r\033[K" AD=$(IDS_NUMBER_FORMAT ${APCPDU_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 ${APCPDU_WATT_avg} 0`'W" + echo -e "${MSG}${idsCL[LightYellow]} ${AD}'A${spc}`IDS_NUMBER_FORMAT ${APCPDU_WATT_avg} 1 yes`'W" else echo 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} 1 yes`'W ${idsBG[Default]}" echo -en "${MSG}" if [ "${avgdays}" != "" ]; then echo -en "${idsCL[Yellow]} Calculating Equipment Subtotal Averages ... " @@ -248,7 +248,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}${idsBG[Blue]}${spcas}${idsCL[LightYellow]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_avg} 0`'W ${idsBG[Default]}" + echo -e "${MSG}${idsBG[Blue]}${spcas}${idsCL[LightYellow]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_avg} 1 yes`'W ${idsBG[Default]}" else echo -e "${idsBG[Default]}" fi @@ -256,7 +256,7 @@ 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="${idsCL[White]}Air Conditioner ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${AIRCON_WATT} 0`'W" + MSG="${idsCL[White]}Air Conditioner ${idsCL[Default]}: ${idsCL[Green]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${AIRCON_WATT} 1 yes`'W" echo -en "${MSG}" if [ "${avgdays}" != "" ]; then echo -en "${idsCL[Yellow]} Calculating Air Conditioner Averages ... " @@ -266,13 +266,13 @@ CHECKPOWER(){ echo -en "\r\033[K" AD=$(IDS_NUMBER_FORMAT ${AIRCON_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 ${AIRCON_WATT_avg} 0`'W" + echo -e "${MSG}${idsCL[LightYellow]} ${AD}'A${spc}`IDS_NUMBER_FORMAT ${AIRCON_WATT_avg} 1 yes`'W" else echo 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} 1 yes`'W ${idsBG[Default]}" echo -en "${MSG}" if [ "${avgdays}" != "" ]; then echo -en "${idsCL[Yellow]} Calculating Server Room w/AIR Total Averages ... " @@ -284,7 +284,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 "${MSG}${idsBG[Blue]}${spcas}${idsCL[LightYellow]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC_avg} 0`'W ${idsBG[Default]}" + echo -e "${MSG}${idsBG[Blue]}${spcas}${idsCL[LightYellow]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC_avg} 1 yes`'W ${idsBG[Default]}" else echo -e "${idsBG[Default]}" fi