CommonInstaller: move installfile from /data/adb/.nanodroid-patcher to /data/adb/NanoDroid_Patched

ChangeLog.md

@@ -14,6 +14,9 @@
   * fix restoring GApps from /system/app in System Mode installations
   * fix removing NanoDroid-Patcher installfile
 
+* On-PC Patcher
+  * fix creating uninstaller information for System Mode
+
 ### General Changes
 
 * CommonInstaller
@@ -30,6 +33,9 @@
   * CommonAddon and Uninstaller support both
   * simplify code for the creation of the installer information
 
+* Patcher, CommonInstaller, Uninstaller
+  * move patcher installfile from /data/adb/.nanodroid-patcher to /data/adb/NanoDroid_Patched
+
 * Uninstaller
   * display correct version number
   * code simplifications

CommonInstaller

@@ -554,24 +554,24 @@ magisk_install_preinst () {
 	fi
 
 	if [ -f ${RESTORE_PATH}/system/framework/services.jar ]; then
-		if [ -f /data/adb/.nanodroid-patcher ]; then
+		if [ -f /data/adb/.nanodroid-patcher -o /data/adb/NanoDroid_Patched ]; then
 			ui_print " << backing up patched services.jar"
 			cp ${RESTORE_PATH}/system/framework/services.jar \
 				${TMPDIR}/services.jar
 		else	ui_print " "
-			ui_print " ++ /data/adb/.nanodroid-patcher is missing, assuming"
+			ui_print " ++ /data/adb/NanoDroid_Patched is missing, assuming"
 			ui_print " ++ ROM was updated, please re-run NanoDroid-Patcher"
 			ui_print " "
 			rm -f ${RESTORE_PATH}/system/framework/services.jar
 		fi
-	elif [ -f /data/adb/.nanodroid-patcher ]; then
+	elif [ -f /data/adb/.nanodroid-patcher -o /data/adb/NanoDroid_Patched ]; then
 		ui_print " "
-		ui_print " ++ /data/adb/.nanodroid-patcher exists, but"
+		ui_print " ++ /data/adb/NanoDroid_Patched exists, but"
 		ui_print " ++ ${RESTORE_PATH}/system/framework/services.jar"
 		ui_print " ++ doesn't, assuming Magisk was uninstalled"
 		ui_print " ++ re-run NanoDroid-Patcher if required"
 		ui_print " "
-		rm -f /data/adb/.nanodroid-patcher
+		rm -f /data/adb/.nanodroid-patcher /data/adb/NanoDroid_Patched
 	fi
 
 	${BOOTMODE} || rm -rf "${MODPATH}"
@@ -585,15 +585,13 @@ magisk_install_preinst () {
 magisk_install_postinst () {
 	if [ -f ${TMPDIR}/system.prop ]; then
 		ui_print " << restoring system.prop"
-		cp ${TMPDIR}/system.prop \
-			${MODPATH}/system.prop
+		cp ${TMPDIR}/system.prop ${MODPATH}/system.prop
 	fi
 
 	if [ -f ${TMPDIR}/services.jar ]; then
 		ui_print " << restoring patched services.jar"
 		mkdir -p ${MODPATH}/system/framework
-		cp ${TMPDIR}/services.jar \
-			${MODPATH}/system/framework/services.jar
+		cp ${TMPDIR}/services.jar ${MODPATH}/system/framework/services.jar
 	fi
 }