fixes

CommonInstaller

@@ -230,6 +230,12 @@ detect_mode () {
 	ui_print "${MODE_TEXT}"
 	ui_print " "
 
+	# backup fonts
+	if [[ "$(file ${MODPATH}/system/fonts/Roboto-Regular.ttf)" = *symbolic* ]]; then
+		ui_print " << Backup custom font"
+		CUSTOM_FONT="$(basename $(ls -l ${MODPATH}/system/fonts/Roboto-Regular.ttf | awk -F '->' '{print $2}') .ttf)"
+	fi
+
 	if [ "${MODE}" = "MAGISK" ]; then
 		magisk_install_setup
 		case ${MODID} in
@@ -242,12 +248,6 @@ detect_mode () {
 				error " !! failed to re-mount /system read-write"
 		unset MODPATH
 	fi
-
-	# backup fonts
-	if [[ "$(file ${MODPATH}/system/fonts/Roboto-Regular.ttf)" = *symbolic* ]]; then
-		ui_print " << backing up custom font"
-		CUSTOM_FONT="$(basename $(ls -l ${MODPATH}/system/fonts/Roboto-Regular.ttf | awk -F '->' '{print $2}') .ttf)"
-	fi
 }
 
 backup_nlpconflicts () {
@@ -540,7 +540,7 @@ magisk_install_finish () {
 	esac
 
 	if [ ! -z ${CUSTOM_FONT} ]; then
-		ui_print " << Restoring custom font"
+		ui_print " << Restore custom font"
 		${MODPATH}/system/bin/nanodroid-font -s "${CUSTOM_FONT}"
 	fi
 

Full/system/bin/nanodroid-font

@@ -66,29 +66,29 @@ reset_font () {
 }
 
 set_font () {
-	echo "Setting Font ${2}"
+	echo "Setting Font ${1}"
 
 	if [ ${NO_MAGISK} -eq 0 ]; then
-		if [ -f ${FONTPATH}/NanoDroid/${2}.ttf ]; then
+		if [ -f ${FONTPATH}/NanoDroid/${1}.ttf ]; then
 			for font in ${FONTFILES}; do
-				ln -sf ${FONTPATH}/NanoDroid/${2}.ttf \
+				ln -sf ${FONTPATH}/NanoDroid/${1}.ttf \
 					${FONTPATH}/${font} || \
-					error "Failed to apply Font ${2}"
+					error "Failed to apply Font ${1}"
 			done
 		else
-			error "Font ${2} does not exist"
+			error "Font ${1} does not exist"
 		fi
 	else
 		backup_font
 
-		if [ -f /system/fonts/NanoDroid/${2}.ttf ]; then
+		if [ -f /system/fonts/NanoDroid/${1}.ttf ]; then
 			for font in ${FONTFILES}; do
-				ln -sf /system/fonts/NanoDroid/${2}.ttf \
+				ln -sf /system/fonts/NanoDroid/${1}.ttf \
 					/system/fonts/${font} || \
-					error "Failed to apply Font ${2}"
+					error "Failed to apply Font ${1}"
 			done
 		else
-			error "Font ${2} does not exist"
+			error "Font ${1} does not exist"
 		fi
 	fi
 
@@ -99,7 +99,7 @@ set_font () {
 
 case ${1} in
 	-s | --set )
-		set_font
+		set_font "${1}"
 	;;
 
 	-r | --reset )