WeiguangTWK
/
LSPosed
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[core] Fix riru version check

This commit is contained in:
tehcneko 2021-03-11 19:23:01 +08:00
parent 7afb339219
commit edf41b715f
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/build.gradle.kts
View File

@ -162,9 +162,7 @@ afterEvaluate {
expand("moduleId" to moduleId, expand("moduleId" to moduleId,
"versionName" to verName, "versionName" to verName,
"versionCode" to verCode, "versionCode" to verCode,
"authorList" to authors, "authorList" to authors)
"apiCode" to apiCode,
"minApi" to "$moduleMinRiruApiVersion")
filter(mapOf("eol" to FixCrLfFilter.CrLf.newInstance("lf")), FixCrLfFilter::class.java) filter(mapOf("eol" to FixCrLfFilter.CrLf.newInstance("lf")), FixCrLfFilter::class.java)
} }
copy { copy {
@ -195,8 +193,9 @@ afterEvaluate {
include("util_functions.sh") include("util_functions.sh")
filter { line -> filter { line ->
line.replace("%%%RIRU_MODULE_ID%%%", riruModuleId) line.replace("%%%RIRU_MODULE_ID%%%", riruModuleId)
.replace("%%%RIRU_MIN_API_VERSION%%%", moduleMinRiruApiVersion.toString()) .replace("%%%RIRU_MODULE_API_VERSION%%%", moduleMaxRiruApiVersion.toString())
.replace("%%%RIRU_MIN_VERSION_NAME%%%", moduleMinRiruVersionName) .replace("%%%RIRU_MODULE_MIN_API_VERSION%%%", moduleMinRiruApiVersion.toString())
.replace("%%%RIRU_MODULE_MIN_RIRU_VERSION_NAME%%%", moduleMinRiruVersionName)
} }
filter(mapOf("eol" to FixCrLfFilter.CrLf.newInstance("lf")), FixCrLfFilter::class.java) filter(mapOf("eol" to FixCrLfFilter.CrLf.newInstance("lf")), FixCrLfFilter::class.java)
} }

4
core/template_override/util_functions.sh
View File

@ -27,13 +27,13 @@ RIRU_MODULE_MIN_RIRU_VERSION_NAME="%%%RIRU_MODULE_MIN_RIRU_VERSION_NAME%%%"
check_riru_version() { check_riru_version() {
RIRU_CORE_MODULES_PATH=/data/adb/modules/riru-core RIRU_CORE_MODULES_PATH=/data/adb/modules/riru-core
RIRU_CORE_MODULES_UPDATE_PATH=/data/adb/modules_update/riru-core RIRU_CORE_MODULES_UPDATE_PATH=/data/adb/modules_update/riru-core
if [ ! -f "$RIRU_CORE_MODULES_UPDATE_PATH/api_version" ] && [ ! -f "$RIRU_CORE_MODULES_PATH/api_version" ] && [ ! -f "/data/adb/riru/api_version" ] && [ ! -f "/data/adb/riru/api_version.new" ]; then if [ ! -f "$RIRU_CORE_MODULES_UPDATE_PATH/api_version" ] && [ ! -f "$RIRU_CORE_MODULES_PATH/api_version" ]; then
ui_print "*********************************************************" ui_print "*********************************************************"
ui_print "! Riru $RIRU_MODULE_MIN_RIRU_VERSION_NAME or above is required" ui_print "! Riru $RIRU_MODULE_MIN_RIRU_VERSION_NAME or above is required"
ui_print "! Please install Riru from Magisk Manager or https://github.com/RikkaApps/Riru/releases" ui_print "! Please install Riru from Magisk Manager or https://github.com/RikkaApps/Riru/releases"
abort "*********************************************************" abort "*********************************************************"
fi fi
RIRU_API=$(cat "$RIRU_CORE_MODULES_UPDATE_PATH/api_version") || RIRU_API=$(cat "$RIRU_CORE_MODULES_PATH/api_version") || RIRU_API=$(cat "/data/adb/riru/api_version.new") || RIRU_API=$(cat "/data/adb/riru/api_version") || RIRU_API=0 RIRU_API=$(cat "$RIRU_CORE_MODULES_UPDATE_PATH/api_version") || RIRU_API=$(cat "$RIRU_CORE_MODULES_PATH/api_version") || RIRU_API=0
[ "$RIRU_API" -eq "$RIRU_API" ] || RIRU_API=0 [ "$RIRU_API" -eq "$RIRU_API" ] || RIRU_API=0
ui_print "- Riru API version: $RIRU_API" ui_print "- Riru API version: $RIRU_API"
if [ "$RIRU_API" -lt $RIRU_MODULE_MIN_API_VERSION ]; then if [ "$RIRU_API" -lt $RIRU_MODULE_MIN_API_VERSION ]; then

2
core/tpl/module.prop.tpl
View File

@ -3,6 +3,4 @@ name=Riru - LSPosed
version=${versionName} version=${versionName}
versionCode=${versionCode} versionCode=${versionCode}
author=${authorList} author=${authorList}
api=${apiCode}
description=Another enhanced implementation of Xposed Framework. Supports Android 8.1 ~ 12 DP1. Requires Riru v23 or above installed. description=Another enhanced implementation of Xposed Framework. Supports Android 8.1 ~ 12 DP1. Requires Riru v23 or above installed.
minApi=${minApi}