Merge pull request #538 from jasonacox/v4.5.5

Hotfix v4.5.5

RELEASE.md

@@ -1,8 +1,15 @@
 # RELEASE NOTES
 
-## v4.5.4 - MacOS Fix
+## v4.5.5 - Hotfix
 
-* Fix bug in `setup.sh` that will error during Grafana "Sun and Moon" provider provisioning, as reported by @jdjammer in https://github.com/jasonacox/Powerwall-Dashboard/issues/534
+* Fix bug introduced in jasonacox/Powerwall-Dashboard/issues/535 as reported in https://github.com/jasonacox/Powerwall-Dashboard/issues/537 by @wagisdev
+
+## v4.5.4 - Misc Bug Fixes
+
+* Fix two spelling mistakes in upgrade script by @wreiske in https://github.com/jasonacox/Powerwall-Dashboard/pull/521
+* Fix PW3 Strings E+F metrics by @jplewis2 in https://github.com/jasonacox/Powerwall-Dashboard/pull/528
+* k3s/kubernettes install by @cfoos in https://github.com/jasonacox/Powerwall-Dashboard/pull/525
+* Fix bug in setup.sh for MacOS hosts #534 by @jasonacox in https://github.com/jasonacox/Powerwall-Dashboard/pull/535
 
 ## v4.5.3 - TEDAPI Route Tool
 

setup.sh

@@ -449,8 +449,10 @@ fi
 
 if [ -f grafana/sunandmoon-template.yml ]; then
     cp grafana/sunandmoon-template.yml grafana/provisions/datasources/sunandmoon.yml
-    sed -i '' "s@zzLAT@${LAT}@g" grafana/provisions/datasources/sunandmoon.yml
-    sed -i '' "s@zzLONG@${LONG}@g" grafana/provisions/datasources/sunandmoon.yml
+    sed -i.bak "s@zzLAT@${LAT}@g" grafana/provisions/datasources/sunandmoon.yml
+    sed -i.bak "s@zzLONG@${LONG}@g" grafana/provisions/datasources/sunandmoon.yml
+    # Remove backup file
+    rm grafana/provisions/datasources/sunandmoon.yml.bak
 fi
 
 # Build Docker in current environment

upgrade.sh

@@ -6,7 +6,7 @@
 set -e
 
 # Set Globals
-VERSION="4.5.4"
+VERSION="4.5.5"
 CURRENT="Unknown"
 COMPOSE_ENV_FILE="compose.env"
 INFLUXDB_ENV_FILE="influxdb.env"