diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 8bc042e5..d11f7c67 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -275,11 +275,11 @@ CHECKPOWER(){ 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) - AS=$(IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC} 0); c=0; spc=''; spc1=`expr ${wspc} - ${#AD} + 3`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done + AS=$(IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC} 0); c=0; spc=''; spc1=`expr ${wspc} - ${#AS} + 3`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done 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]}${AS}${idsCL[LightYellow]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC_avg} 0`'W ${idsBG[Default]}" + echo -e "${MSG}${idsBG[Blue]}$(IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC} 0)${idsCL[LightYellow]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${SVRRM_WATT_WAC_avg} 0`'W ${idsBG[Default]}" else echo -e "${idsBG[Default]}" fi