From 8a00ee2d17c35d1b38e8d410e45c80977c45a497 Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Wed, 7 Feb 2024 09:26:02 -0600
Subject: [PATCH] update

---
 defaults.inc     | 2 +-
 inc/power.inc.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index c4c7b186..debadff9 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-VERS='2.5.281-02072024'
+VERS='2.5.282-02072024'
 
 noheader=' update service dailytemp confsync -r -report '
 
diff --git a/inc/power.inc.sh b/inc/power.inc.sh
index 04a41e2a..e27c14d7 100644
--- a/inc/power.inc.sh
+++ b/inc/power.inc.sh
@@ -621,8 +621,7 @@ OFFSITE_CHECKPOWER_SERVICE(){
 			fi
 			
 			SENDNOTICE(){
-				SN_MSG="$(echo -e "${2}" | sed "s/\%/\%25 /g")"
-				MESSAGE="${TESTMODE}${SN_MSG}
+				MESSAGE="${TESTMODE}${2}
 
 BATTERY CHARGE: ${OFFSITE_BATT_CAP}'%
 BATT RUNTIME: ${OFFSITE_BATT_RUNTIME}'mins
@@ -631,6 +630,7 @@ WATT USAGE: ${OFFSITE_WATTS}'watts
 AMBIENT TEMP: ${OFFSITE_TEMP}'F
 
 $(date)"
+				MESSAGE="$(echo -e "${2}" | 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
 			}