diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 50bd9fff..476186c1 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -62,7 +62,7 @@ CHECKPOWER(){ -k|-kyle) STYPE=kyle;; -e|-esxi) PTYPE=esxi;; -p|-power) PTYPE=power;; - -r|-report) + -r|-report) REPORT=1 unset idsCL idsBG idsST idsCL=('') @@ -341,9 +341,11 @@ CHECKPOWER(){ [ ${REPORT} -eq 0 ] && echo -en "\r\033[K" echo -e "${idsCL[White]}UPS Status ${idsCL[Default]}: ${idsCL[LightCyan]}${OFFSITE_STATUS}${idsCL[Default]}" - [ ${REPORT} -eq 0 ] && echo - echo -e "${idsCL[White]}UPS Voltage In ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_VOLTIN}`'volts${idsCL[Default]}" - echo -e "${idsCL[White]}UPS Voltage Out ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_VOLTOUT}`'volts${idsCL[Default]}" + if [ ${REPORT} -eq 0 ]; then + echo + echo -e "${idsCL[White]}UPS Voltage In ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_VOLTIN}`'volts${idsCL[Default]}" + echo -e "${idsCL[White]}UPS Voltage Out ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_VOLTOUT}`'volts${idsCL[Default]}" + fi echo -e "${idsCL[White]}UPS Load Usage ${idsCL[Default]}: ${idsCL[Green]}${OFFSITE_LOAD}%${idsCL[Default]}" [ ${REPORT} -eq 0 ] && echo echo -e "${idsCL[White]}UPS Battery Capacity ${idsCL[Default]}: ${idsCL[Green]}`IDS_NUMBER_FORMAT ${OFFSITE_BATT_CAP}`%${idsCL[Default]}" @@ -1367,7 +1369,7 @@ SENDPOWER(){ } OFFSITE_SENDPOWER(){ - st_power=`${PW_SCRIPT} check temp -o -S -r; ${PW_SCRIPT} check power -o -p -r` + st_power=`${PW_SCRIPT} check temp -o -S -r -x usage; ${PW_SCRIPT} check power -o -p -r` SENDNOTICE "${1}" "${st_power}" 0 cosmic }