CommonInstaller: improve /system/xbin handling, log value

CommonInstaller

@@ -2,7 +2,6 @@
 
 VERSION=16.3.20180327
 
-
 GOOGLE_APPS="GoogleFeedback
 GoogleLoginService
 GoogleOneTimeInitializer
@@ -290,7 +289,10 @@ backup_nlpconflicts () {
 						ui_print " ++ it conflicts with microG location backends"
 						ui_print " "
 
-						${MODPATH}/system/bin/nanodroid-overlay --add ${app}
+						if [ "${ROM_NO_XBIN}" -eq 1 ]; then
+							${MODPATH}/system/bin/nanodroid-overlay --add ${app}
+						else	${MODPATH}/system/xbin/nanodroid-overlay --add ${app}
+						fi
 					fi
 				;;
 			esac
@@ -369,7 +371,7 @@ detect_arch () {
 				SWIPE_LIBDIR=lib64 ;;
 	esac
 
-	chmod +x "${INSTALLER}/system/bin/unzip.${BIN_ARCH}"
+	chmod +x "${INSTALLER}/system/xbin/unzip.${BIN_ARCH}"
 
 	case ${SDK_VERSION} in
 		19 )		GSYNC_VER=K	;;
@@ -391,6 +393,12 @@ detect_arch () {
 		ui_print " ++ compatibility is not garantueed!"
 		ui_print " "
 	fi
+
+	if [ ! -d /system/xbin ]; then
+		ROM_NO_XBIN=1
+		echo " ++ ROM has no /system/xbin, using /system/bin instead"
+	else	ROM_NO_XBIN=0
+	fi
 }
 
 ##########################################################################################
@@ -507,7 +515,10 @@ magisk_install_postinst () {
 	if [ "${nanodroid_overlay}" -eq 1 ]; then
 		ui_print " << with /system applications override"
 
-		${MODPATH}/system/bin/nanodroid-overlay --create
+		if [ "${ROM_NO_XBIN}" -eq 1 ]; then
+			${MODPATH}/system/bin/nanodroid-overlay --create
+		else	${MODPATH}/system/xbin/nanodroid-overlay --create
+		fi
 	else
 		ui_print " << without /system applications override"
 	fi
@@ -550,7 +561,10 @@ magisk_install_finish () {
 
 	if [ ! -z ${CUSTOM_FONT} -a ${nanodroid_fonts} -eq 1 ]; then
 		ui_print " << Restore NanoDroid-Font (${CUSTOM_FONT})"
-		${MODPATH}/system/bin/nanodroid-font -s "${CUSTOM_FONT}"
+		if [ "${ROM_NO_XBIN}" -eq 1 ]; then
+			${MODPATH}/system/bin/nanodroid-font -s "${CUSTOM_FONT}"
+		else	${MODPATH}/system/xbin/nanodroid-font -s "${CUSTOM_FONT}"
+		fi
 	fi
 
 	unmount_magisk_img
@@ -898,12 +912,7 @@ nanodroid_install_file () {
 		error " !! file: ${file} not found"
 
 	# if /system/xbin does not exist, use /system/bin
-	if [ "${dir}" = "xbin" ]; then
-		if [ ! -d /system/xbin ]; then
-			echo "  ++ xbin does not exist, using bin instead"
-			dir="bin"
-		fi
-	fi
+	[ "${dir}" = "xbin" -a "${ROM_NO_XBIN}" -eq 1 ] && dir="bin"
 
 	# strip off .${BIN_ARCH} from final filename (if any)
 	xfile=$(basename ${file} .${BIN_ARCH})
@@ -941,7 +950,7 @@ nanodroid_install_lib () {
 
 	unset srcdir
 
-	"${INSTALLER}/system/bin/unzip.${BIN_ARCH}" \
+	"${INSTALLER}/system/xbin/unzip.${BIN_ARCH}" \
 		-oq ${apk} "lib/*" -d "${TMP_LIBDIR}" \
 		2>/dev/null
 	unzip_return=$?
@@ -1031,6 +1040,7 @@ REALPATH=${REALPATH}
 MODE=${MODE}
 MAGISK_VER_CODE=${MAGISK_VER_CODE}
 CUSTOM_FONT=${CUSTOM_FONT}
+ROM_NO_XBIN=${ROM_NO_XBIN}
 
 ### SETUP ###
 " > /data/adb/.nanodroid_${MODID}