From 7dafa0618e92cd4d51604b53463b4b236d20b9dc Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 3 Sep 2022 14:00:05 -0500
Subject: [PATCH] cand1

---
 defaults.inc | 3 +++
 powerwall.sh | 6 ++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index 0a54209c..8de3b846 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,4 +1,7 @@
 
+FOLDER='/opt/idssys/powerwall'
+VERS='1.090322'
+
 mqtt_conn='/usr/bin/mosquitto_sub -h 127.0.0.1 -u mqtt -P 12mqtt34password56'
 mysql_conn='/usr/bin/mysql -h mysqldb.scity.us -P 3306 --user=sysmoninsert --password=sysmoninsert'
 
diff --git a/powerwall.sh b/powerwall.sh
index fd4e9325..23c331d6 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -2,11 +2,9 @@
 # powerwall - CLI commands to control VM guest power
 
 action="$1"
-FOLDER='/opt/idssys/powerwall'
-VERS='1.030921'
 
-source /opt/idssys/powerwall/defaults.inc
-source /opt/idssys/powerwall/powerwall.conf
+source $FOLDER/defaults.inc
+source $FOLDER/powerwall.conf
 source /opt/idssys/defaults/colors.inc
 source /opt/idssys/defaults/default.inc