fixed: updated services are not always restarted; add ExtTransferSwit…

…ch to default package list
kwindrem · Jun 25, 2023 · 73cf6ea · 73cf6ea
1 parent a8cf9b5
commit 73cf6ea
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 19 deletions.
diff --git a/ServiceResources b/ServiceResources
@@ -197,31 +197,34 @@ installService ()
 
     # service already installed - only copy changed files, then restart service if it is running
     else
-        logMessage "restarting $serviceName service"
         if [ -f "$servicePath/run" ]; then
             cmp -s "$servicePath/run" "$serviceDir/$serviceName/run" > /dev/null
             if (( $? != 0 )); then
+				logMessage "updating $serviceName run file"
                 cp "$servicePath/run" "$serviceDir/$serviceName/run"
 				if $serviceMountedTmpfs ; then
 					cp "$servicePath/run" "/service/$serviceName/run"
 				fi
-				if serviceIsUp $serviceName ; then
-					svc -t "/service/$serviceName"
-				fi
             fi
+			if serviceIsUp $serviceName ; then
+				logMessage "restarting $serviceName service"
+				svc -t "/service/$serviceName"
+			fi
         fi
 		# log needs to be handled separtely including a restart
         if [ -f "$servicePath/log/run" ]; then
             cmp -s "$servicePath/log/run" "$serviceDir/$serviceName/log/run" > /dev/null
             if (( $? != 0 )); then
+				logMessage "updating $serviceName log/run file"
                 cp "$servicePath/log/run" "$serviceDir/$serviceName/log/run"
 				if $serviceMountedTmpfs ; then
 					cp "$servicePath/log/run" "/service/$serviceName/log/run"
 				fi
-				if serviceIsUp "$serviceName/log" ; then
-					svc -t "/service/$serviceName/log"
-				fi
            fi
+			if serviceIsUp "$serviceName/log" ; then
+				logMessage "restarting $serviceName logger"
+				svc -t "/service/$serviceName/log"
+			fi
         fi
     fi
 }
diff --git a/blindInstall/SetupHelperVersion b/blindInstall/SetupHelperVersion
@@ -1 +1 @@
-v4.41
+v4.42
diff --git a/changes b/changes
@@ -1,3 +1,7 @@
+v4.42:
+	fixed: updated services are not always restarted
+	add ExtTransferSwitch to default package list
+
 v4.41:
 	added support for dark mode (thanks mr-manual)
 

diff --git a/defaultPackageList b/defaultPackageList
@@ -8,19 +8,20 @@
 # incomplete lines are ignored
 
 # Package             GitHubUser    Tag/branch/version
+SetupHelper           kwindrem      latest
+GuiMods               kwindrem      latest
+ExtTransferSwitch     kwindrem      latest
+ShutdownMonitor       kwindrem      latest
+VeCanSetup            kwindrem      latest
+RpiDisplaySetup       kwindrem      latest
+RpiGpioSetup          kwindrem      latest
+# obsolete TankRepeater          kwindrem      latest
+
 123SmartBMS-Venus     123electric   latest
+RpiTemperature        TimD1981      latest
 BatteryAggregator     pulquero      latest
 dbus-i2c              pulquero      latest
 DCSystemAggregator    pulquero      latest
-FroniusSmartmeter     SirUli        main
 gatt-exec-server      pulquero      latest
-GeneratorConnector    kwindrem      latest
-GuiMods               kwindrem      latest
-RpiDisplaySetup       kwindrem      latest
-RpiGpioSetup          kwindrem      latest
-RpiTemperature        TimD1981      latest
-SetupHelper           kwindrem      latest
-ShutdownMonitor       kwindrem      latest
-TankRepeater          kwindrem      latest
-VeCanSetup            kwindrem      latest
+FroniusSmartmeter     SirUli        main
 venus-os_ngrok        mr-manuel     latest
diff --git a/venus-data.UninstallPackages.tar.gz b/venus-data.UninstallPackages.tar.gz
diff --git a/venus-data.UninstallPackages.tgz b/venus-data.UninstallPackages.tgz
diff --git a/venus-data.tgz b/venus-data.tgz
diff --git a/version b/version
@@ -1 +1 @@
-v4.41
+v4.42