fix: Apatch -> APatch

This commit fixes the name of APatch in "build.gradle.kts" and "customize.sh" files.
This commit is contained in:
ThePedroo
2024-06-30 23:07:26 -03:00
parent c9c15bf120
commit 7399ae417d
4 changed files with 11 additions and 11 deletions

View File

@@ -23,7 +23,7 @@ val moduleName by extra("ReZygisk")
val verName by extra("v1.0.0") val verName by extra("v1.0.0")
val verCode by extra(gitCommitCount) val verCode by extra(gitCommitCount)
val commitHash by extra(gitCommitHash) val commitHash by extra(gitCommitHash)
val minApatchVersion by extra(10655) val minAPatchVersion by extra(10655)
val minKsuVersion by extra(10940) val minKsuVersion by extra(10940)
val minKsudVersion by extra(11425) val minKsudVersion by extra(11425)
val maxKsuVersion by extra(20000) val maxKsuVersion by extra(20000)

View File

@@ -24,7 +24,7 @@ val moduleId: String by rootProject.extra
val moduleName: String by rootProject.extra val moduleName: String by rootProject.extra
val verCode: Int by rootProject.extra val verCode: Int by rootProject.extra
val verName: String by rootProject.extra val verName: String by rootProject.extra
val minApatchVersion: Int by rootProject.extra val minAPatchVersion: Int by rootProject.extra
val minKsuVersion: Int by rootProject.extra val minKsuVersion: Int by rootProject.extra
val minKsudVersion: Int by rootProject.extra val minKsudVersion: Int by rootProject.extra
val maxKsuVersion: Int by rootProject.extra val maxKsuVersion: Int by rootProject.extra
@@ -70,7 +70,7 @@ androidComponents.onVariants { variant ->
include("customize.sh", "post-fs-data.sh", "service.sh", "uninstall.sh") include("customize.sh", "post-fs-data.sh", "service.sh", "uninstall.sh")
val tokens = mapOf( val tokens = mapOf(
"DEBUG" to if (buildTypeLowered == "debug") "true" else "false", "DEBUG" to if (buildTypeLowered == "debug") "true" else "false",
"MIN_APATCH_VERSION" to "$minApatchVersion", "MIN_APATCH_VERSION" to "$minAPatchVersion",
"MIN_KSU_VERSION" to "$minKsuVersion", "MIN_KSU_VERSION" to "$minKsuVersion",
"MIN_KSUD_VERSION" to "$minKsudVersion", "MIN_KSUD_VERSION" to "$minKsudVersion",
"MAX_KSU_VERSION" to "$maxKsuVersion", "MAX_KSU_VERSION" to "$maxKsuVersion",
@@ -216,7 +216,7 @@ androidComponents.onVariants { variant ->
} }
} }
val installApatchTask = task<Exec>("installApatch$variantCapped") { val installAPatchTask = task<Exec>("installAPatch$variantCapped") {
group = "module" group = "module"
dependsOn(pushTask) dependsOn(pushTask)
commandLine("adb", "shell", "su", "-c", "/data/adb/apd module install /data/local/tmp/$zipFileName") commandLine("adb", "shell", "su", "-c", "/data/adb/apd module install /data/local/tmp/$zipFileName")
@@ -228,9 +228,9 @@ androidComponents.onVariants { variant ->
commandLine("adb", "shell", "su", "-M", "-c", "magisk --install-module /data/local/tmp/$zipFileName") commandLine("adb", "shell", "su", "-M", "-c", "magisk --install-module /data/local/tmp/$zipFileName")
} }
task<Exec>("installKpatchAndReboot$variantCapped") { task<Exec>("installAPatchAndReboot$variantCapped") {
group = "module" group = "module"
dependsOn(installApatchTask) dependsOn(installAPatchTask)
commandLine("adb", "reboot") commandLine("adb", "reboot")
} }

View File

@@ -36,11 +36,11 @@ if [ "$BOOTMODE" ] && [ "$KSU" ]; then
abort "*********************************************************" abort "*********************************************************"
fi fi
elif [ "$BOOTMODE" ] && [ "$APATCH" ]; then elif [ "$BOOTMODE" ] && [ "$APATCH" ]; then
ui_print "- Installing from Apatch app" ui_print "- Installing from APatch app"
if ! [ "$APATCH_VER_CODE" ] || [ "$APATCH_VER_CODE" -lt "$MIN_APATCH_VERSION" ]; then if ! [ "$APATCH_VER_CODE" ] || [ "$APATCH_VER_CODE" -lt "$MIN_APATCH_VERSION" ]; then
ui_print "*********************************************************" ui_print "*********************************************************"
ui_print "! Apatch version is too old!" ui_print "! APatch version is too old!"
ui_print "! Please update Apatch to latest version" ui_print "! Please update APatch to latest version"
abort "*********************************************************" abort "*********************************************************"
fi fi
elif [ "$BOOTMODE" ] && [ "$MAGISK_VER_CODE" ]; then elif [ "$BOOTMODE" ] && [ "$MAGISK_VER_CODE" ]; then

View File

@@ -3,7 +3,7 @@ plugins {
alias(libs.plugins.rust.android) alias(libs.plugins.rust.android)
} }
val minApatchVersion: Int by rootProject.extra val minAPatchVersion: Int by rootProject.extra
val minKsuVersion: Int by rootProject.extra val minKsuVersion: Int by rootProject.extra
val maxKsuVersion: Int by rootProject.extra val maxKsuVersion: Int by rootProject.extra
val minMagiskVersion: Int by rootProject.extra val minMagiskVersion: Int by rootProject.extra
@@ -27,7 +27,7 @@ cargo {
profile = if (isDebug) "debug" else "release" profile = if (isDebug) "debug" else "release"
exec = { spec, _ -> exec = { spec, _ ->
spec.environment("ANDROID_NDK_HOME", android.ndkDirectory.path) spec.environment("ANDROID_NDK_HOME", android.ndkDirectory.path)
spec.environment("MIN_APATCH_VERSION", minApatchVersion) spec.environment("MIN_APATCH_VERSION", minAPatchVersion)
spec.environment("MIN_KSU_VERSION", minKsuVersion) spec.environment("MIN_KSU_VERSION", minKsuVersion)
spec.environment("MAX_KSU_VERSION", maxKsuVersion) spec.environment("MAX_KSU_VERSION", maxKsuVersion)
spec.environment("MIN_MAGISK_VERSION", minMagiskVersion) spec.environment("MIN_MAGISK_VERSION", minMagiskVersion)