diff --git a/defaults.inc b/defaults.inc index 3a6ac03a..e6d593d5 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ -VERS='2.3.231-11172023' +VERS='2.3.232-11232023' noheader=' update service dailytemp ' @@ -150,8 +150,8 @@ unset IFS SENDNOTICE(){ [ "${PUSHOVER_APP_TOKEN}" != "" ] && PUSH_TO_MOBILE "${2} -$(date)" "${1}" ${3} & +"$(date +%Y-%m-%d-%H-%M-%S)" "${1}" ${3} & - [ "${EMAIL_NOTICE}" != "" ] && echo -e "${2}\n\n$(date)" | mail -s "${1}" ${EMAIL_NOTICE} + [ "${EMAIL_NOTICE}" != "" ] && echo -e "${2}\n\n"$(date +%Y-%m-%d-%H-%M-%S)" | mail -s "${1}" ${EMAIL_NOTICE} } \ No newline at end of file diff --git a/offsite-power-check.sh b/offsite-power-check.sh index 1acccb0a..3fe781bf 100755 --- a/offsite-power-check.sh +++ b/offsite-power-check.sh @@ -55,9 +55,7 @@ PWO_START(){ BATTERY CHARGE: ${OFFSITE_BATT_CAP}%25 BATT RUNTIME: ${OFFSITE_BATT_RUNTIME}'mins -AC VOLTAGE: ${OFFSITE_VOLTIN}'volts - -$(date)" +AC VOLTAGE: ${OFFSITE_VOLTIN}'volts" if [ "${3}" = "1" ]; then PRIORITY="${3}"; MSGSOUND=siren; elif [ "${3}" != "" ]; then PRIORITY=${3}; else PRIORITY=0; fi curl -sd "token=${PUSHOVER_APP_TOKEN}&user=${PUSHOVER_USER_TOKEN}&message=${MESSAGE}&title=${1}&priority=${PRIORITY}&sound=cosmic" https://api.pushover.net/1/messages.json >/dev/null 2>&1 }