CommonInstaller:

- move custom Magisk < 19.0 img handling code into own function
- improve Magisk > 19 vs. Magisk < 19 Code
- other minor improvements

CommonInstaller

@@ -281,7 +281,7 @@ detect_mode () {
 
 			if [ -f "${NANODROID_LIST}" ]; then
 				MODE=SYSTEM
-			elif [ -f /data/adb/magisk/magisk ]; then
+			elif [ -f /data/adb/magisk/magisk -o -d /data/adb/modules ]; then
 				MODE=MAGISK
 			elif [ -f /data/.magisk/magisk ]; then
 				migrate_magisk_custom /data/.magisk/
@@ -298,6 +298,13 @@ detect_mode () {
 	ui_print " > Mode   | ${MODE}            | ${MODE_DETECT}"
 	ui_print " "
 
+	if [ "${nanodroid_fonts}" -eq 1 ]; then
+		if test -h ${MODPATH}/system/fonts/Roboto-Regular.ttf; then
+			CUSTOM_FONT="$(basename $(readlink ${MODPATH}/system/fonts/Roboto-Regular.ttf) .ttf)"
+			ui_print " << Detected NanoDroid-Font (${CUSTOM_FONT})"
+		fi
+	fi
+
 	if [ "${MODE}" = "SYSTEM" ]; then
 		if [ -f "${NANODROID_LIST}" ]; then
 			NANODROID_UPGRADE=1
@@ -305,18 +312,10 @@ detect_mode () {
 		fi
 
 		recovery_actions
-	fi
-
-	[ "${MODE}" = "MAGISK" ] && magisk_install_setup
-
-	if [ "${nanodroid_fonts}" -eq 1 ]; then
-		if test -h ${MODPATH}/system/fonts/Roboto-Regular.ttf; then
-			CUSTOM_FONT="$(basename $(readlink ${MODPATH}/system/fonts/Roboto-Regular.ttf) .ttf)"
-			ui_print " << Detected NanoDroid-Font (${CUSTOM_FONT})"
-		fi
-	fi
+		unset MODPATH
+	else
+		magisk_install_setup
 
-	if [ "${MODE}" = "MAGISK" ]; then
 		case ${MODID} in
 			NanoDroid | NanoDroid_microG )
 				magisk_install_preinst
@@ -324,7 +323,6 @@ detect_mode () {
 		esac
 
 		rm -rf "${MODPATH}"
-	else	unset MODPATH
 	fi
 
 	if [ "${ROM_NO_XBIN}" -eq 0 ]; then
@@ -556,6 +554,41 @@ magisk_install_setup () {
 
 		recovery_actions
 	else
+		magisk_install_setup_old
+	fi
+
+	case ${MODID} in
+		NanoDroid )
+			# check for sub-modules  which are not
+			# supposed to be installed alongside
+			for dir in NanoDroid_microG NanoDroid_FDroid; do
+				if [ -d ${MOUNTPATH}/${dir} ]; then
+					ui_print " !! ${dir} module detected - uninstalling!"
+					rm -rf ${MOUNTPATH}/${dir}
+					NANODROID_UPGRADE=1
+				fi
+			done
+		;;
+
+		NanoDroid_microG | NanoDroid_FDroid )
+			# check for Full package and abort if found
+			[ -d ${MOUNTPATH}/NanoDroid ] && \
+				error "${MODID} can't be installed along side the Full package"
+		;;
+
+		NanoDroid_BromiteWebView | NanoDroid_OsmAnd )
+			true
+		;;
+
+		* )
+			error "unknown module intended to be installed!?"
+		;;
+	esac
+
+	[ -d ${MODPATH} ] && NANODROID_UPGRADE=1
+}
+
+magisk_install_setup_old () {
 	MOUNTPATH=${TMPDIR}/magisk_img
 	MODPATH=${MOUNTPATH}/${MODID}
 	REALPATH=/sbin/.magisk/img/${MODID}
@@ -592,37 +625,6 @@ magisk_install_setup () {
 		MAGISKLOOP=`${MAGISKBIN}/magisk imgtool mount ${IMG} ${MOUNTPATH}`
 		is_mounted ${MOUNTPATH} || error "failed to mount ${IMG}"
 	fi
-	fi
-
-	case ${MODID} in
-		NanoDroid )
-			# check for sub-modules  which are not
-			# supposed to be installed alongside
-			for dir in NanoDroid_microG NanoDroid_FDroid; do
-				if [ -d ${MOUNTPATH}/${dir} ]; then
-					ui_print " !! ${dir} module detected - uninstalling!"
-					rm -rf ${MOUNTPATH}/${dir}
-					NANODROID_UPGRADE=1
-				fi
-			done
-		;;
-
-		NanoDroid_microG | NanoDroid_FDroid )
-			# check for Full package and abort if found
-			[ -d ${MOUNTPATH}/NanoDroid ] && \
-				error "${MODID} can't be installed along side the Full package"
-		;;
-
-		NanoDroid_BromiteWebView | NanoDroid_OsmAnd )
-			true
-		;;
-
-		* )
-			error "unknown module intended to be installed!?"
-		;;
-	esac
-
-	[ -d ${MODPATH} ] && NANODROID_UPGRADE=1
 }
 
 magisk_install_preinst () {
@@ -661,8 +663,8 @@ magisk_install_finish () {
 	[ ${MAGISK_VER_CODE} -le 18100 ] && mktouch ${MODPATH}/auto_mount
 	cp -af ${INSTALLER}/module.prop ${MODPATH}/module.prop
 
-	if [[ -f ${INSTALLER}/common/service.sh ]]; then
-		cp -af ${INSTALLER}/common/service.sh ${MODPATH}/service.sh
+	if [ -f ${INSTALLER}/service.sh ]; then
+		cp -af ${INSTALLER}/service.sh ${MODPATH}/service.sh
 		chmod +x ${MODPATH}/service.sh
 	fi
 
@@ -677,8 +679,10 @@ magisk_install_finish () {
 		${NANODROID_BINDIR}/nanodroid-font -s "${CUSTOM_FONT}"
 	fi
 
+	if [ ${MAGISK_VER_CODE} -le 18100 ]; then
 		unmount_magisk_img
 		e2fsck -yf ${IMG}
+	fi
 
 	recovery_cleanup
 }