diff --git a/inc/power.inc.sh b/inc/power.inc.sh index f8ca42ae..cc6e9711 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -341,7 +341,7 @@ CHECKPOWER(){ AD1=$(IDS_NUMBER_FORMAT ${UPS_AMPSIN} 2 yes); c=0; spc1=''; spca=`expr ${wspc} - ${#AD1}`; until [ ${c} = ${spca} ]; do spc1="${spc1} "; ((c++)); done echo -en "${idsCL[White]}UPS Input ${idsCL[Default]}: ${idsCL[Green]}${AD1}'A${spc1}`IDS_NUMBER_FORMAT ${UPS_VOLTIN}`'V${idsCL[Default]}" if [ "${avgdays}" != "" ]; then - echo -en "${idsCL[Yellow]} Calculating ${avgdays_disp} Average ... " + echo -en "${idsCL[Yellow]} Calculating ${avgdays_disp} Average ... " AMP_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['ups-input']} ${avgdays} amp) [ ${REPORT} -eq 0 ] && echo -en "\r\033[K" echo -e "${idsCL[White]}UPS Input ${idsCL[Default]}: ${idsCL[Green]}${AD1}'A${spc1}`IDS_NUMBER_FORMAT ${UPS_VOLTIN}`'V${idsCL[LightYellow]} ${AMP_avg}'A${idsCL[Default]}" @@ -352,7 +352,7 @@ CHECKPOWER(){ AD2=$(IDS_NUMBER_FORMAT ${UPS_AMPSOUT} 2 yes); c=0; spc2=''; spca=`expr ${wspc} - ${#AD2}`; until [ ${c} = ${spca} ]; do spc2="${spc2} "; ((c++)); done echo -en "${idsCL[White]}UPS Output ${idsCL[Default]}: ${idsCL[Green]}${AD2}'A${spc1}`IDS_NUMBER_FORMAT ${UPS_VOLTOUT}`'V${idsCL[Default]}" if [ "${avgdays}" != "" ]; then - echo -en "${idsCL[Yellow]} Calculating ${avgdays_disp} Average ... " + echo -en "${idsCL[Yellow]} Calculating ${avgdays_disp} Average ... " AMP_avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID['ups-output']} ${avgdays} amp) [ ${REPORT} -eq 0 ] && echo -en "\r\033[K" echo -e "${idsCL[White]}UPS Output ${idsCL[Default]}: ${idsCL[Green]}${AD2}'A${spc1}`IDS_NUMBER_FORMAT ${UPS_VOLTOUT}`'V${idsCL[LightYellow]} ${AMP_avg}'A${idsCL[Default]}" @@ -398,7 +398,7 @@ CHECKPOWER(){ c=0; spc3=''; spca=`expr ${wspc} - ${#AD3}`; until [ ${c} = ${spca} ]; do spc3="${spc3} "; ((c++)); done [ ${REPORT} -eq 0 ] && echo -e "${spc3}${VOLT}'V${idsCL[Default]}" else - echo -en "${idsCL[Yellow]} Calculating ${avgdays_disp} Average ... " + echo -en "${idsCL[Yellow]} Calculating ${avgdays_disp} Average ... " avg=$(AVERAGEPOWER ${PW_POWERSENSOR_ID[${mSENSOR}]} ${avgdays} both) AMP_avg=$(echo ${avg} | cut -d'~' -f 1) WATT_avg=$(echo ${avg} | cut -d'~' -f 2)