diff --git a/defaults.inc b/defaults.inc index 454de586..daa91999 100755 --- a/defaults.inc +++ b/defaults.inc @@ -83,12 +83,12 @@ SENDNOTICE(){ ${SN_MSG} -$(date)" "${SN_TIT}" ${3} & +$(date)" "${SN_TIT}" ${3} ${4} & else # echo "HERE: [${SN_TIT}]=${SN_MSG}: DONE" PUSH_TO_MOBILE "${SN_MSG} -$(date)" "${SN_TIT}" ${3} & +$(date)" "${SN_TIT}" ${3} ${4} & fi fi [ "${PW_EMAIL_NOTICE}" != "" ] && echo -e "${2}\n\n$(date +%Y-%m-%d-%H-%M-%S)" | mail -s "${1}" ${PW_EMAIL_NOTICE} diff --git a/inc/power.inc.sh b/inc/power.inc.sh index 58033f29..e3c336d3 100644 --- a/inc/power.inc.sh +++ b/inc/power.inc.sh @@ -631,7 +631,7 @@ AMBIENT TEMP: ${OFFSITE_TEMP}'F" # MESSAGE="$(echo -e "${MESSAGE}" | sed "s/\%/\%25 /g")" # if [ "${3}" = "1" ]; then PRIORITY="${3}"; MSGSOUND=siren; elif [ "${3}" != "" ]; then PRIORITY=${3}; else PRIORITY=0; fi # curl -m 3 -sd "token=${PW_PUSHOVER_APP_TOKEN}&user=${PW_PUSHOVER_USER_TOKEN}&message=$(echo "${MESSAGE}" | sed -e "s/%/%25/g")&title=${1}&priority=${PRIORITY}&sound=cosmic" https://api.pushover.net/1/messages.json >/dev/null 2>&1 - SENDNOTICE "${1}" "${MESSAGE}" + SENDNOTICE "${1}" "${MESSAGE}" ${3} "alien" } if [ "${startup}" = "true" ]; then echo "($(date +'%Y-%m-%d %H:%M:%S')) - ${OFFSITE_VOLTIN}'volts - ${OFFSITE_WATTS}'watts - ${OFFSITE_BATT_CAP}'% Battery - ${OFFSITE_BATT_RUNTIME}'mins - Service startup" >> ${PW_LOGPOWER}