add support for v3.50~22

kwindrem · Sep 17, 2024 · 2cf9038 · 2cf9038
1 parent ac75b0e
commit 2cf9038
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 8 deletions.
diff --git a/HelperResources/CommonResources b/HelperResources/CommonResources
@@ -370,7 +370,7 @@ updateRestartFlags ()
 {
 	# flag indicating any file update occurred
 	filesUpdated=true
-echo $1
+
 	case $1 in
 		/opt/victronenergy/gui*)
 			restartGui=true
@@ -460,9 +460,12 @@ updateActiveFile ()
 		return 1
 	fi
 
-	# if the location of the active file must exist
-	if [ ! -e "$(dirname "$activeFile")" ]; then
-		setInstallFailed $EXIT_FILE_SET_ERROR "path to $activeFile does not exist"
+	# the location of the active file must exist
+	#### TODO: accommodate moved style sheet or skip file (not an error) if active does not exist ?????????
+	local pathToActive=$(dirname "$activeFile")
+	if [ ! -e "$pathToActive" ]; then
+		logMessage "WARNING path to $activeFile does not exist - skiping patch"
+		######### setInstallFailed $EXIT_FILE_SET_ERROR "path to $activeFile does not exist"
 		return 1
 	fi
 
@@ -1555,7 +1558,8 @@ if [ $scriptAction != 'UNINSTALL' ]; then
 			rm -f "$currentPatchFile"
 
 			if ! [ -e "$activeFile" ] ; then
-				patchErrors+=( "$baseName no active file for patch" )
+				#### TODO: ??? patchErrors+=( "$baseName no active file for patch" )
+				logMessage "WARNING: $baseName no active file for patch - skipping"
 				continue
 			fi
 

diff --git a/blindInstall/SetupHelperVersion b/blindInstall/SetupHelperVersion
@@ -1 +1 @@
-v8.19
+v8.20
diff --git a/changes b/changes
@@ -1,3 +1,7 @@
+v8.20:
+	add support for v3.50~22 (HTML style sheet in different location)
+	add dbus-pi package to defaults list
+
 v8.19:
 	fixed: system reboots after user chooses to reboot later
 

diff --git a/defaultPackageList b/defaultPackageList
@@ -23,6 +23,7 @@ BatteryAggregator     pulquero      latest
 dbus-i2c              pulquero      latest
 DCSystemAggregator    pulquero      latest
 gatt-exec-server      pulquero      latest
+dbus-pi               pulquero      latest
 FroniusSmartmeter     SirUli        main
 venus-os_ngrok        mr-manuel     latest
 RemoteGPIO            Lucifer06     main
diff --git a/updatePackage b/updatePackage
@@ -799,7 +799,7 @@ for package in $packageList; do
 			patchFiles=( $( ls "$patchSourceDir/$baseName"*.patch ) )
 			for (( i1 = 0; i1 < $allFileSetsLength; i1++ )); do
 				IFS=':' read version versionNumber <<< "${allFileSets[$i1]}"
-				stockFile="$stockFiles/$version/$file"
+				stockFile="$stockFiles/$version$file"
 				replacement="$workingFiles/$version/$baseName"
 				if ! [ -f "$stockFile" ]; then
 					continue

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 @@
-v8.19
+v8.20