From c5dad0d9f08609b7999fef9f88be0c37d933f41f Mon Sep 17 00:00:00 2001 From: Christopher Roy Bratusek Date: Sat, 17 Mar 2018 14:28:47 +0100 Subject: [PATCH] improve previous commits --- CommonInstaller | 13 ++++++++++--- Full/META-INF/com/google/android/update-binary | 1 + .../NanoDroid/{Splatfont2.ttf => Splatoon2.ttf} | Bin doc/.nanodroid-setup | 1 + 4 files changed, 12 insertions(+), 3 deletions(-) rename Full/system/fonts/NanoDroid/{Splatfont2.ttf => Splatoon2.ttf} (100%) diff --git a/CommonInstaller b/CommonInstaller index b6f171a..a45c4e9 100644 --- a/CommonInstaller +++ b/CommonInstaller @@ -719,14 +719,20 @@ install_nanodroidscripts () { nanodroid_install_file bin/${script} bin done - if [ "${MODID}" = "NanoDroid" ]; then + nanodroid_substitute bin/nanodroid-overlay + nanodroid_substitute bin/nanodroid-prop +} + +install_fonts () { + if [ "${nanodroid_fonts}" -eq 1 ]; then + ui_print " << Nintendo Fonts" nanodroid_install_file bin/nanodroid-font bin nanodroid_substitute bin/nanodroid-font nanodroid_install_file bin/nfnt bin + + nanodroid_install_dir fonts fi - nanodroid_substitute bin/nanodroid-overlay - nanodroid_substitute bin/nanodroid-prop } install_nano () { @@ -1078,6 +1084,7 @@ check_cfg_setup () { [ -z ${nanodroid_bash} ] && set_prop nanodroid_bash 1 [ -z ${nanodroid_nano} ] && set_prop nanodroid_nano 1 [ -z ${nanodroid_utils} ] && set_prop nanodroid_utils 1 + [ -z ${nanodroid_fonts} ] && set_prop nanodroid_fonts 1 source ${cfg_setup} } diff --git a/Full/META-INF/com/google/android/update-binary b/Full/META-INF/com/google/android/update-binary index 5818702..e5222d5 100644 --- a/Full/META-INF/com/google/android/update-binary +++ b/Full/META-INF/com/google/android/update-binary @@ -46,6 +46,7 @@ install_bash install_nano install_nanodroidscripts install_shell_utils +install_fonts nanodroid_finalize diff --git a/Full/system/fonts/NanoDroid/Splatfont2.ttf b/Full/system/fonts/NanoDroid/Splatoon2.ttf similarity index 100% rename from Full/system/fonts/NanoDroid/Splatfont2.ttf rename to Full/system/fonts/NanoDroid/Splatoon2.ttf diff --git a/doc/.nanodroid-setup b/doc/.nanodroid-setup index 0af3160..1666dbb 100644 --- a/doc/.nanodroid-setup +++ b/doc/.nanodroid-setup @@ -14,3 +14,4 @@ nanodroid_nlpbackend=1 nanodroid_nano=1 nanodroid_bash=1 nanodroid_utils=1 +nanodroid_fonts=1