diff --git a/build.gradle.kts b/build.gradle.kts index 832c9bf..445eb0f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -23,7 +23,7 @@ val moduleName by extra("ReZygisk") val verName by extra("v1.0.0") val verCode by extra(gitCommitCount) val commitHash by extra(gitCommitHash) -val minApatchVersion by extra(10655) +val minAPatchVersion by extra(10655) val minKsuVersion by extra(10940) val minKsudVersion by extra(11425) val maxKsuVersion by extra(20000) diff --git a/module/build.gradle.kts b/module/build.gradle.kts index 820e7c9..b9d327a 100644 --- a/module/build.gradle.kts +++ b/module/build.gradle.kts @@ -24,7 +24,7 @@ val moduleId: String by rootProject.extra val moduleName: String by rootProject.extra val verCode: Int 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 minKsudVersion: 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") val tokens = mapOf( "DEBUG" to if (buildTypeLowered == "debug") "true" else "false", - "MIN_APATCH_VERSION" to "$minApatchVersion", + "MIN_APATCH_VERSION" to "$minAPatchVersion", "MIN_KSU_VERSION" to "$minKsuVersion", "MIN_KSUD_VERSION" to "$minKsudVersion", "MAX_KSU_VERSION" to "$maxKsuVersion", @@ -216,7 +216,7 @@ androidComponents.onVariants { variant -> } } - val installApatchTask = task("installApatch$variantCapped") { + val installAPatchTask = task("installAPatch$variantCapped") { group = "module" dependsOn(pushTask) 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") } - task("installKpatchAndReboot$variantCapped") { + task("installAPatchAndReboot$variantCapped") { group = "module" - dependsOn(installApatchTask) + dependsOn(installAPatchTask) commandLine("adb", "reboot") } diff --git a/module/src/customize.sh b/module/src/customize.sh index 2e17fa3..741581f 100644 --- a/module/src/customize.sh +++ b/module/src/customize.sh @@ -36,11 +36,11 @@ if [ "$BOOTMODE" ] && [ "$KSU" ]; then abort "*********************************************************" fi 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 ui_print "*********************************************************" - ui_print "! Apatch version is too old!" - ui_print "! Please update Apatch to latest version" + ui_print "! APatch version is too old!" + ui_print "! Please update APatch to latest version" abort "*********************************************************" fi elif [ "$BOOTMODE" ] && [ "$MAGISK_VER_CODE" ]; then diff --git a/zygiskd/build.gradle.kts b/zygiskd/build.gradle.kts index 698cefc..536393c 100644 --- a/zygiskd/build.gradle.kts +++ b/zygiskd/build.gradle.kts @@ -3,7 +3,7 @@ plugins { alias(libs.plugins.rust.android) } -val minApatchVersion: Int by rootProject.extra +val minAPatchVersion: Int by rootProject.extra val minKsuVersion: Int by rootProject.extra val maxKsuVersion: Int by rootProject.extra val minMagiskVersion: Int by rootProject.extra @@ -27,7 +27,7 @@ cargo { profile = if (isDebug) "debug" else "release" exec = { spec, _ -> 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("MAX_KSU_VERSION", maxKsuVersion) spec.environment("MIN_MAGISK_VERSION", minMagiskVersion)