From 7ae60be2578385cf4669fbcc3c5997b47697c790 Mon Sep 17 00:00:00 2001
From: Christopher Roy Bratusek <nano@jpberlin.de>
Date: Wed, 11 Jul 2018 22:11:34 +0200
Subject: [PATCH] CommonInstaller: don't treat magisk_merge.img special

---
 ChangeLog.md                       | 2 ++
 CommonInstaller                    | 2 +-
 Full/system/xbin/nanodroid-overlay | 2 --
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index ef3d424..5b5d5a8 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -4,6 +4,8 @@
 
 ### Bug Fixes
 
+* CommonInstaller
+  * fix installation through Magisk Manager
 * nanodroid-overlay Script
   * fix `-r` parameter not working
 
diff --git a/CommonInstaller b/CommonInstaller
index e3dc988..66fd1d6 100644
--- a/CommonInstaller
+++ b/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"
diff --git a/Full/system/xbin/nanodroid-overlay b/Full/system/xbin/nanodroid-overlay
index 3b19f6e..eff0d0e 100755
--- a/Full/system/xbin/nanodroid-overlay
+++ b/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