diff --git a/module.gradle b/module.gradle index 146ad3c..4b293dd 100644 --- a/module.gradle +++ b/module.gradle @@ -7,7 +7,7 @@ ext { moduleVersionCode = 15 moduleMinRiruApiVersion = 9 moduleMinRiruVersionName = "v23.0" - moduleMaxRiruApiVersion = 10 + moduleRiruApiVersion = 10 moduleProp = [ name : moduleName, diff --git a/module/build.gradle b/module/build.gradle index d91fad1..dd3459c 100644 --- a/module/build.gradle +++ b/module/build.gradle @@ -11,7 +11,7 @@ android { cmake { arguments "-DMODULE_NAME:STRING=riru_$moduleId", "-DRIRU_MODULE_ID=$moduleId", - "-DRIRU_MODULE_API_VERSION=$moduleMaxRiruApiVersion", + "-DRIRU_MODULE_API_VERSION=$moduleRiruApiVersion", "-DRIRU_MODULE_VERSION=$moduleVersionCode", "-DRIRU_MODULE_VERSION_NAME:STRING=\"$moduleVersion\"" @@ -85,8 +85,9 @@ android.libraryVariants.all { variant -> include 'riru.sh' filter { line -> line.replaceAll('%%%RIRU_MODULE_ID%%%', moduleId) - .replaceAll('%%%RIRU_MIN_API_VERSION%%%', moduleMinRiruApiVersion.toString()) - .replaceAll('%%%RIRU_MIN_VERSION_NAME%%%', moduleMinRiruVersionName) + .replaceAll('%%%RIRU_MODULE_API_VERSION%%%', moduleRiruApiVersion.toString()) + .replaceAll('%%%RIRU_MODULE_MIN_API_VERSION%%%', moduleMinRiruApiVersion.toString()) + .replaceAll('%%%RIRU_MODULE_MIN_RIRU_VERSION_NAME%%%', moduleMinRiruVersionName) } filter(FixCrLfFilter.class, eol: FixCrLfFilter.CrLf.newInstance("lf")) diff --git a/template/magisk_module/riru.sh b/template/magisk_module/riru.sh index 47379cf..15b6613 100644 --- a/template/magisk_module/riru.sh +++ b/template/magisk_module/riru.sh @@ -4,20 +4,23 @@ RIRU_MODULE_ID="%%%RIRU_MODULE_ID%%%" RIRU_MODULE_PATH="$RIRU_PATH/modules/$RIRU_MODULE_ID" RIRU_SECONTEXT="u:object_r:magisk_file:s0" -check_riru_version() { - RIRU_MIN_API_VERSION=%%%RIRU_MIN_API_VERSION%%% - RIRU_MIN_VERSION_NAME="%%%RIRU_MIN_VERSION_NAME%%%" +# used by /data/adb/riru/util_functions.sh +RIRU_MODULE_API_VERSION=%%%RIRU_MODULE_API_VERSION%%% +RIRU_MODULE_MIN_API_VERSION=%%%RIRU_MODULE_MIN_API_VERSION%%% +RIRU_MODULE_MIN_RIRU_VERSION_NAME="%%%RIRU_MODULE_MIN_RIRU_VERSION_NAME%%%" +# this function will be used when /data/adb/riru/util_functions.sh not exits +check_riru_version() { if [ ! -f "$RIRU_PATH/api_version" ] && [ ! -f "$RIRU_PATH/api_version.new" ]; then ui_print "*********************************************************" ui_print "! Riru $RIRU_MIN_VERSION_NAME or above is required" ui_print "! Please install Riru from Magisk Manager or https://github.com/RikkaApps/Riru/releases" abort "*********************************************************" fi - RIRU_API_VERSION=$(cat "$RIRU_PATH/api_version.new") || RIRU_API_VERSION=$(cat "$RIRU_PATH/api_version") || RIRU_API_VERSION=0 - [ "$RIRU_API_VERSION" -eq "$RIRU_API_VERSION" ] || RIRU_API_VERSION=0 - ui_print "- Riru API version: $RIRU_API_VERSION" - if [ "$RIRU_API_VERSION" -lt $RIRU_MIN_API_VERSION ]; then + local_api_version=$(cat "$RIRU_PATH/api_version.new") || local_api_version=$(cat "$RIRU_PATH/api_version") || local_api_version=0 + [ "$local_api_version" -eq "$local_api_version" ] || local_api_version=0 + ui_print "- Riru API version: $local_api_version" + if [ "$local_api_version" -lt $RIRU_MODULE_MIN_API_VERSION ]; then ui_print "*********************************************************" ui_print "! Riru $RIRU_MIN_VERSION_NAME or above is required" ui_print "! Please upgrade Riru from Magisk Manager or https://github.com/RikkaApps/Riru/releases" @@ -25,10 +28,9 @@ check_riru_version() { fi } -check_architecture() { - if [ "$ARCH" != "arm" ] && [ "$ARCH" != "arm64" ] && [ "$ARCH" != "x86" ] && [ "$ARCH" != "x64" ]; then - abort "! Unsupported platform: $ARCH" - else - ui_print "- Device platform: $ARCH" - fi -} \ No newline at end of file +if [ -f /data/adb/riru/util_functions.sh ]; then + ui_print "- Load /data/adb/riru/util_functions.sh" + . /data/adb/riru/util_functions.sh +else + ui_print "- Can't find /data/adb/riru/util_functions.sh" +fi \ No newline at end of file