CommonInstaller: don't treat magisk_merge.img special

ChangeLog.md

@@ -4,6 +4,8 @@
 
 ### Bug Fixes
 
+* CommonInstaller
+  * fix installation through Magisk Manager
 * nanodroid-overlay Script
   * fix `-r` parameter not working
 

CommonInstaller

@@ -401,7 +401,7 @@ magisk_install_setup () {
 	ui_print " > setup Magisk environment"
 
 	MAGISKBIN=/data/adb/magisk
-	${BOOTMODE} && MOUNTPATH=${TMPDIR}/magisk_merge_img || MOUNTPATH=${TMPDIR}/magisk_img
+	MOUNTPATH=${TMPDIR}/magisk_img
 
 	[ -d ${MAGISKBIN} -a -f ${MAGISKBIN}/magisk -a -f ${MAGISKBIN}/util_functions.sh ] || \
 		error " !! Magisk version 15.0 or newer is required"

Full/system/xbin/nanodroid-overlay

@@ -5,8 +5,6 @@ export MODPATH=@MODPATH@
 
 if [[ -d /dev/tmp/magisk_img/$(basename ${MODPATH}) ]]; then
 	OVERLAY_PATH=/dev/tmp/magisk_img/$(basename ${MODPATH})
-elif [[ -d /dev/tmp/magisk_merge_img/$(basename ${MODPATH}) ]]; then
-	OVERLAY_PATH=/dev/tmp/magisk_merge_img/$(basename ${MODPATH})
 else
 	OVERLAY_PATH=${MODPATH}
 	[[ "${MODPATH}" != "/sbin/.core/"* ]] && NO_MAGISK=1