Merge pull request openWB#1554 from LKuemmel/fix

fix resetting backup_before_update at reboot, fix show update in prog…
okaegi · Apr 16, 2024 · 091efaf · 091efaf
2 parents 930e79e + d3e7583
commit 091efaf
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/packages/helpermodules/command.py b/packages/helpermodules/command.py
@@ -630,6 +630,8 @@ def systemShutdown(self, connection_id: str, payload: dict) -> None:
 
     def systemUpdate(self, connection_id: str, payload: dict) -> None:
         log.info("Update requested")
+        # notify system about running update, notify abput end update in script
+        Pub().pub("openWB/system/update_in_progress", True)
         if SubData.system_data["system"].data["backup_before_update"]:
             self.createCloudBackup(connection_id, {})
         parent_file = Path(__file__).resolve().parents[2]

diff --git a/packages/helpermodules/update_config.py b/packages/helpermodules/update_config.py
@@ -365,7 +365,7 @@ class UpdateConfig:
         "^openWB/system/backup_cloud/config$",
         "^openWB/system/boot_done$",
         "^openWB/system/configurable/backup_clouds$",
-        "^openWB/system/backup_cloud/backup_before_update$"
+        "^openWB/system/backup_cloud/backup_before_update$",
         "^openWB/system/configurable/chargepoints$",
         "^openWB/system/configurable/chargepoints_internal$",
         "^openWB/system/configurable/devices_components$",

diff --git a/runs/update_self.sh b/runs/update_self.sh
@@ -10,9 +10,6 @@ SELECTEDTAG=$2
 echo "#### running update ####" >"$LOGFILE"
 
 {
-	# notify system about running update
-	mosquitto_pub -p 1886 -t "openWB/system/update_in_progress" -r -m 'true'
-
 	# fetch new release from GitHub
 	echo "#### 1. fetching latest data from '$GITREMOTE' ####"
 	git -C "$OPENWBBASEDIR" fetch -v "$GITREMOTE" && echo "#### done"