From 77c4667d4b6ce0d087b4a6a98178d5be39ab5d73 Mon Sep 17 00:00:00 2001
From: Christopher Roy Bratusek <nano@jpberlin.de>
Date: Thu, 2 Aug 2018 20:03:45 +0200
Subject: [PATCH] CommonInstaller: fix installation with Magisk 16.7 without
 reboot into System first time

---
 CommonInstaller | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/CommonInstaller b/CommonInstaller
index 64e0339..0033281 100644
--- a/CommonInstaller
+++ b/CommonInstaller
@@ -227,6 +227,19 @@ detect_mode () {
 		0 | *)
 			if [ -f /data/adb/magisk/magisk ]; then
 				MODE=MAGISK
+				MAGISKBIN=/data/adb/magisk
+				MODE_TEXT=" > Mode   | Magisk            | detected"
+			elif [ -f /data/.magisk/magisk ]; then
+				if [ ! -d /data/adb/ ]; then
+					mkdir -p /data/adb/
+					chown root:root /data/adb
+					chmod 0644 /data/adb
+				fi
+
+				cp -r /data/.magisk /data/adb/magisk
+
+				MODE=MAGISK
+				MAGISKBIN=/data/adb/magisk
 				MODE_TEXT=" > Mode   | Magisk            | detected"
 			elif ! ${BOOTMODE}; then
 				MODE=SYSTEM
@@ -401,10 +414,9 @@ magisk_install_setup () {
 	ui_print " "
 	ui_print " > setup Magisk environment"
 
-	MAGISKBIN=/data/adb/magisk
 	MOUNTPATH=${TMPDIR}/magisk_img
 
-	[ -d ${MAGISKBIN} -a -f ${MAGISKBIN}/magisk -a -f ${MAGISKBIN}/util_functions.sh ] || \
+	[ -f ${MAGISKBIN}/util_functions.sh ] || \
 		error " !! Magisk version 15.0 or newer is required"
 
 	. ${MAGISKBIN}/util_functions.sh