diff --git a/defaults.inc b/defaults.inc index d9896714..57b6c5f1 100755 --- a/defaults.inc +++ b/defaults.inc @@ -72,17 +72,19 @@ fi SENDNOTICE(){ if [ "${PUSHOVER_APP_TOKEN}" != "" ]; then + SN_TIT="$(echo -e "${1}" | sed "s/\%/\%25 /g")" + SN_MSG="$(echo -e "${2}" | sed "s/\%/\%25 /g")" if [ "${TEST_INPUTACV}" != "" ] || [ "${TEST_BATTVOLT}" != "" ]; then PUSH_TO_MOBILE "***TEST MODE*** -$(echo ${2} | sed "s/\%/\%25 /g") +${SN_MSG} -$(date)" "$(echo ${1} | sed "s/\%/\%25 /g")" ${3} & +$(date)" "${SN_TIT}" ${3} & else - echo "HERE: [$(echo ${1} | sed "s/\%/\%25 /g")]=$(echo ${2} | sed "s/\%/\%25 /g"): DONE" - PUSH_TO_MOBILE "$(echo ${2} | sed "s/\%/\%25 /g") + echo "HERE: [${SN_TIT}]=${SN_MSG}: DONE" + PUSH_TO_MOBILE "${SN_MSG} -$(date)" "$(echo ${1} | sed "s/\%/\%25 /g")" ${3} & +$(date)" "${SN_TIT}" ${3} & fi fi [ "${PW_EMAIL_NOTICE}" != "" ] && echo -e "${2}\n\n$(date +%Y-%m-%d-%H-%M-%S)" | mail -s "${1}" ${PW_EMAIL_NOTICE}