fixed: active file not always updated by a patched file - SILENTLY !

Author: kwindrem

HelperResources/CommonResources

@@ -1589,17 +1589,18 @@ if [ $scriptAction != 'UNINSTALL' ]; then
 		patchErrors=()
 		for activeFile in ${fileListPatched[@]}; do
 			baseName=$( basename $activeFile )
-			tempActiveFile="$tempFileDir/$baseName"
+			tempActiveFile="$tempFileDir/$baseName.tmp"
+			forwardPatched="$tempFileDir/$baseName.patchedForInstall"
 			currentPatchFile="$tempFileDir/$baseName.currentPatch"
 			previousPatchFile="$previousPatchesDir/$baseName.patch"
 
-			rm -f "$currentPatchFile"
-
 			if ! [ -e "$activeFile" ] ; then
 				logMessage "no active file $activeFile - skipping patch"
 				continue
 			fi
 
+			rm -f "$currentPatchFile"
+
 			# check for this and other packages in .package list
 			packageList="$activeFile.package"
 			thisPackageInList=false
@@ -1656,7 +1657,6 @@ if [ $scriptAction != 'UNINSTALL' ]; then
 				# the first one that successfully creates a forward AND reverse patch is used
 				# .patchedForInstall provides the patched file for updateActiveFile
 				patchFiles=( $( ls "$patchSourceDir/$baseName"*.patch ) )
-				forwardPatched="$tempActiveFile.patchedForInstall"
 				for patchFile in ${patchFiles[@]};do
 					if $patch --forward -o "$forwardPatched" "$tempActiveFile" "$patchFile" &> /dev/null ; then
 						# forward patch succeeded - test reverse patch (both must succeed)

blindInstall/SetupHelperVersion

@@ -1 +1 @@
-v8.28
+v8.29

changes

@@ -1,4 +1,7 @@
-v8.28: (pending)
+v8.29:
+	fixed: active file not always updated by a patched file - SILENTLY !
+
+v8.28:
 	remove venus-os_ngrok from default package list
 	first compatible version is now v3.10
 

venus-data-UninstallPackages.tgz

@@ -1 +1 @@
-v8.28
+v8.29