diff --git a/customize.sh b/customize.sh index b718c8b..6363feb 100644 --- a/customize.sh +++ b/customize.sh @@ -1,15 +1,15 @@ -if [ "$MAGISK_VER_CODE" -lt 24000 ]; then -ui_print "*********************************************************" -ui_print "! Please install Magisk v24+" -abort "*********************************************************" -fi if [ "$API" -lt 26 ]; then ui_print "*********************************************************" ui_print "! Please upgrade your system to Android 8+" abort "*********************************************************" fi - -[ -x "$(which magisk)" ] && CMDPREFIX="magisk --denylist exec" || unset CMDPREFIX +[ -x `which magisk` ] && { +if magisk --denylist ls &>/dev/null; then +CMDPREFIX="magisk --denylist exec" +elif magisk magiskhide ls &>/dev/null; then +CMDPREFIX="magisk magiskhide exec" +fi +} || unset CMDPREFIX FILES="fonts.xml fonts_base.xml" FILECUSTOM=fonts_customization.xml FILEPATHS="/system/etc/ /system_ext/etc/" diff --git a/extra/changelog.md b/extra/changelog.md index d740731..58fb1b4 100644 --- a/extra/changelog.md +++ b/extra/changelog.md @@ -1,3 +1,7 @@ +# Changelog v25 + +- Support 3rd party Magisk versions with magiskhide. + # Changelog v24 - Fixes for Magisk Canary(26404) support. Dropping copies of fonts from internal mirror mount point. [#48](https://github.com/simonsmh/notocjk/issues/48) diff --git a/module.prop b/module.prop index fe3bf1a..fd0d99c 100644 --- a/module.prop +++ b/module.prop @@ -1,7 +1,7 @@ id=notocjk name=NotoCJK -version=24 (Sans-2.004-VF/Serif-2.002-VF) -versionCode=24 +version=25 (Sans-2.004-VF/Serif-2.002-VF) +versionCode=25 author=simonsmh description=NotoCJK (NotoSansCJK & NotoSerifCJK) full weight fonts patch for every Android devices. updateJson=https://cdn.jsdelivr.net/gh/simonsmh/notocjk/version.json diff --git a/version.json b/version.json index 561cc79..5c5d76e 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { - "version": "24 (Sans-2.004-VF/Serif-2.002-VF)", - "versionCode": 24, - "zipUrl": "https://github.com/simonsmh/notocjk/releases/download/24/notocjk.zip", + "version": "25 (Sans-2.004-VF/Serif-2.002-VF)", + "versionCode": 25, + "zipUrl": "https://github.com/simonsmh/notocjk/releases/download/25/notocjk.zip", "changelog": "https://cdn.jsdelivr.net/gh/simonsmh/notocjk/extra/changelog.md" }