CommonInstaller: fix installer not detecting upgrade when flashing through Magisk Manager

ChangeLog.md

@@ -4,6 +4,9 @@
 
 ### Bug Fixes
 
+* CommonInstaller
+  * fix installer not detecting upgrade when flashing through Magisk Manager
+
 * CommonAddon, PatcherAddon
   * fix printing messages
 

CommonInstaller

@@ -497,7 +497,8 @@ magisk_install_setup () {
 	${BOOTMODE} && IMG=/data/adb/magisk_merge.img || IMG=/data/adb/magisk.img
 
 	MODPATH=${MOUNTPATH}/${MODID}
-	REALPATH=/sbin/.core/img/${MODID}
+	MAGISKPATH=/sbin/.core/img
+	REALPATH=${MAGISKPATH}/${MODID}
 
 	${BOOTMODE} && boot_actions || recovery_actions
 	${BOOTMODE} && RESTORE_PATH=${REALPATH} || RESTORE_PATH=${MODPATH}
@@ -510,9 +511,9 @@ magisk_install_setup () {
 			# check for sub-modules  which are not
 			# supposed to be installed alongside
 			for dir in NanoDroid_microG NanoDroid_FDroid; do
-				if [ -d ${MOUNTPATH}/${dir} -o -d ${REALPATH}/${dir} ]; then
+				if [ -d ${MOUNTPATH}/${dir} -o -d ${MAGISKPATH}/${dir} ]; then
 					ui_print " !! ${dir} module detected - uninstalling!"
-					rm -rf ${MOUNTPATH}/${dir} ${REALPATH}/${dir}
+					rm -rf ${MOUNTPATH}/${dir} ${MAGISKPATH}/${dir}
 					NANODROID_UPGRADE=1
 				fi
 			done
@@ -520,7 +521,7 @@ magisk_install_setup () {
 
 		NanoDroid_microG | NanoDroid_FDroid )
 			# check for Full package and abort if found
-			[ -d ${MOUNTPATH}/NanoDroid -o -d ${REALPATH}/NanoDroid ] && \
+			[ -d ${MOUNTPATH}/NanoDroid -o -d ${MAGISKPATH}/NanoDroid ] && \
 				error "${MODID} can't be installed along side the Full package"
 		;;
 
@@ -529,7 +530,7 @@ magisk_install_setup () {
 		;;
 	esac
 
-	[ -d ${MOUNTPATH}/${MODID} -o -d ${REALPATH}/${MODID} ] && NANODROID_UPGRADE=1
+	[ -d ${MOUNTPATH}/${MODID} -o -d ${MAGISKPATH}/${MODID} ] && NANODROID_UPGRADE=1
 }
 
 magisk_install_preinst () {