Patcher:

* fix check for updating Magisk Module
* install patcher environment in /system/addon.d

patcher/CommonPatcher

@@ -10,6 +10,11 @@ VERSION=23.0.99999999
 MAGISKBASE=/data/adb
 MODID=NanoDroid_Patcher
 
+TMPDIR=/dev/tmp/install
+APEX_LD=/system
+
+PATCHER_ADDOND_DATA=/system/addon.d/nanodroid_patcher
+
 ##########################################################################################
 # Generic Functions
 ##########################################################################################
@@ -25,13 +30,6 @@ show_banner () {
 	ui_print " "
 }
 
-setup_environment () {
-	TMPDIR=/dev/tmp/install
-	APEX_LD=/system
-
-	export PATCHER_ADDOND_DATA=/data/adb/nanodroid_patcher
-}
-
 ui_print() {
 	${BOOTMODE} && echo "${1}" || \
 		echo -e "ui_print ${1}\nui_print" >> /proc/self/fd/${OUTFD}
@@ -623,23 +621,12 @@ patch_services () {
 			error "zip failed"
 }
 
-backup_services_jar () {
-	ui_print " << backing up services.jar to: /data/media/0/nanodroid_backups"
-	services_name="services.jar_$(grep_prop ro.build.flavor)_$(grep_prop ro.build.id)"
-
-	mkdir -p /data/media/0/nanodroid_backups
-	cp /system/framework/services.jar "/data/media/0/nanodroid_backups/${services_name}" || \
-		error "failed to backup services.jar"
-}
-
 install_services () {
 	install_path=""
 	ui_print " "
 
-	if [ "${MODE}" = "SYSTEM" ]; then
-		backup_services_jar
-	else
-		if [ -d "${MAGISKBASE}/modules/NanoDroidPatcher" ]; then
+	if [ "${MODE}" = "MAGISK" ]; then
+		if [ -d "${MAGISKBASE}/modules/${MODID}" ]; then
 			install_path="${MAGISKBASE}/modules_update/${MODID}"
 		else
 			install_path="${MAGISKBASE}/modules/${MODID}"
@@ -692,7 +679,6 @@ install_addond () {
 		chmod 0755 ${PATCHER_ADDOND_DATA}/$(basename "${file}")
 	done
 
-	mkdir -p /system/addon.d/
 	cp "${BASEDIR}/70-nanodroidpatcher.sh" /system/addon.d/
 	chmod 0755 /system/addon.d/70-nanodroidpatcher.sh
 }

patcher/dexpatcher/70-nanodroidpatcher.sh

@@ -15,21 +15,10 @@
 source /tmp/backuptool.functions
 
 OUTFD=
-BASEDIR=/data/adb/nanodroid_patcher
+BASEDIR=/system/addon.d/nanodroid_patcher
 
 detect_outfd
 
-if [ ! -f ${BASEDIR}/CommonPatcher ]; then
-	ui_print " "
-	ui_print " !! NanoDroid-Patcher environment missing"
-	ui_print " !! guessing, you've wiped /data ?"
-	ui_print " !! re-flash the NanoDroid-Patcher zip"
-	ui_print " "
-	exit 0
-else
-	source "/data/adb/nanodroid_patcher/CommonPatcher"
-fi
-
 NanoDroidPatcher () {
 	sleep 5
 
@@ -37,11 +26,6 @@ NanoDroidPatcher () {
 
 	mount_partitions
 
-	for artifact in classes.dex oat dalvik-cache \
-		services.jar services.jar-mod; do
-		rm -rf ${BASEDIR}/${artifact}
-	done
-
 	detect_sdk
 	detect_arch
 
@@ -56,6 +40,11 @@ NanoDroidPatcher () {
 
 	umount_partitions
 
+	for artifact in classes.dex oat dalvik-cache \
+		services.jar services.jar-mod; do
+		rm -rf ${BASEDIR}/${artifact}
+	done
+
 	ui_print " "
 	ui_print " > Done!"
 	ui_print " "