diff --git a/inc/power.inc.sh b/inc/power.inc.sh index fe1cae0f..cbf84279 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -334,11 +334,11 @@ CHECKPOWER(){ echo -e "${idsCL[White]}UPS Status ${idsCL[Default]}: ${idsCL[LightCyan]}${UPS_DISP_STATUS}${idsCL[Default]}" if [ ${REPORT} -eq 0 ]; then - AD1=$(IDS_NUMBER_FORMAT ${UPS_AMPSIN} 2 yes); c=0; spc1=''; spca=`expr ${wspc} - ${#AD1}`; until [ ${c} = ${spca} ]; do spc1="${spc1} "; ((c++)); done - AD2=$(IDS_NUMBER_FORMAT ${UPS_AMPSOUT} 2 yes); c=0; spc2=''; spca=`expr ${wspc} - ${#AD2}`; until [ ${c} = ${spca} ]; do spc2="${spc2} "; ((c++)); done echo - echo -e "${idsCL[LightCyan]} Amps Volts" - [ "${avgdays}" != "" ] && echo -e " Amps" + echo -en "${idsCL[LightCyan]} Amps Volts" + [ "${avgdays}" != "" ] && echo -e " Amps" || echo "" + + 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 "" @@ -349,6 +349,8 @@ CHECKPOWER(){ [ ${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]} ${AD}'A${idsCL[Default]}" fi + + AD2=$(IDS_NUMBER_FORMAT ${UPS_AMPSOUT} 2 yes); c=0; spc2=''; spca=`expr ${wspc} - ${#AD2}`; until [ ${c} = ${spca} ]; do spc2="${spc2} "; ((c++)); done echo -e "${idsCL[White]}UPS Output ${idsCL[Default]}: ${idsCL[Green]}${AD2}'A${spc1}`IDS_NUMBER_FORMAT ${UPS_VOLTOUT}`'V${idsCL[Default]}" echo fi