diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 8b4dcd2f..5aa15917 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -608,10 +608,6 @@ CHECKPOWER(){ AD=$(IDS_NUMBER_FORMAT ${KYLE_AMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done MSG="${idsCL[White]}Outlet #7 Power ${idsCL[Default]}: ${idsCL[White]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${KYLE_WATT} 1 yes`'W ${idsCL[Default]}" echo -en "${MSG}" - AD=$(IDS_NUMBER_FORMAT ${KYLE_SASAMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done - MSG="${idsCL[White]}Outlet #7 Power ${idsCL[Default]}: ${idsCL[White]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${KYLE_SASWATT} 1 yes`'W ${idsCL[Default]}" - echo -en "${MSG}" - if [ "${avgdays}" != "" ]; then echo -en "${idsCL[Yellow]} Calculating Kyle's Total Power Averages ... " @@ -625,7 +621,12 @@ CHECKPOWER(){ echo -e "${MSG}${spcA}${idsCL[LightYellow]}${AD}'A${spcB}`IDS_NUMBER_FORMAT ${KYLE_WATT_avg} 1 yes`'W ${idsCL[Default]}" else echo -e "${idsCL[Default]}" - fi + fi + + AD=$(IDS_NUMBER_FORMAT ${KYLE_SASAMP} 2 yes); c=0; spc=''; spc1=`expr ${wspc} - ${#AD}`; until [ ${c} = ${spc1} ]; do spc="${spc} "; ((c++)); done + MSG="${idsCL[White]}Outlet #7 Power ${idsCL[Default]}: ${idsCL[White]}${AD}'A${spc}`IDS_NUMBER_FORMAT ${KYLE_SASWATT} 1 yes`'W ${idsCL[Default]}" + echo -en "${MSG}" + fi