From d08b4155775405f5140a0cf195d7e284bd46b8c8 Mon Sep 17 00:00:00 2001 From: Nullptr Date: Mon, 20 Feb 2023 20:41:00 +0800 Subject: [PATCH] Require ksud version --- build.gradle.kts | 5 +++-- module/build.gradle.kts | 2 ++ module/src/customize.sh | 9 ++++++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8661ed5..db09959 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -33,8 +33,9 @@ val moduleId by extra("zygisksu") val moduleName by extra("Zygisk on KernelSU") val verName by extra("v4-0.4.1") val verCode by extra(gitCommitCount) -val minKsuVersion by extra(10626) -val maxKsuVersion by extra(100000) +val minKsuVersion by extra(10654) +val minKsudVersion by extra(10647) +val maxKsuVersion by extra(20000) val minMagiskVersion by extra(25000) val androidMinSdkVersion by extra(29) diff --git a/module/build.gradle.kts b/module/build.gradle.kts index 9ce479f..6a7e663 100644 --- a/module/build.gradle.kts +++ b/module/build.gradle.kts @@ -12,6 +12,7 @@ val moduleName: String by rootProject.extra val verCode: Int by rootProject.extra val verName: String by rootProject.extra val minKsuVersion: Int by rootProject.extra +val minKsudVersion: Int by rootProject.extra val maxKsuVersion: Int by rootProject.extra val minMagiskVersion: Int by rootProject.extra @@ -54,6 +55,7 @@ androidComponents.onVariants { variant -> val tokens = mapOf( "DEBUG" to if (buildTypeLowered == "debug") "true" else "false", "MIN_KSU_VERSION" to "$minKsuVersion", + "MIN_KSUD_VERSION" to "$minKsudVersion", "MAX_KSU_VERSION" to "$maxKsuVersion", "MIN_MAGISK_VERSION" to "$minMagiskVersion", ) diff --git a/module/src/customize.sh b/module/src/customize.sh index 2e04098..aa0f73d 100644 --- a/module/src/customize.sh +++ b/module/src/customize.sh @@ -3,13 +3,14 @@ SKIPUNZIP=1 DEBUG=@DEBUG@ MIN_KSU_VERSION=@MIN_KSU_VERSION@ +MIN_KSUD_VERSION=@MIN_KSUD_VERSION@ MAX_KSU_VERSION=@MAX_KSU_VERSION@ MIN_MAGISK_VERSION=@MIN_MAGISK_VERSION@ if [ "$BOOTMODE" ] && [ "$KSU" ]; then ui_print "- Installing from KernelSU app" ui_print "- KernelSU version: $KSU_KERNEL_VER_CODE (kernel) + $KSU_VER_CODE (ksud)" - if [ "$KSU_KERNEL_VER_CODE" ] && [ "$KSU_KERNEL_VER_CODE" -lt "$MIN_KSU_VERSION" ]; then + if ! [ "$KSU_KERNEL_VER_CODE" ] || [ "$KSU_KERNEL_VER_CODE" -lt "$MIN_KSU_VERSION" ]; then ui_print "*********************************************************" ui_print "! KernelSU version is too old!" ui_print "! Please update KernelSU to latest version" @@ -21,6 +22,12 @@ if [ "$BOOTMODE" ] && [ "$KSU" ]; then ui_print " as submodule instead of copying the source code" abort "*********************************************************" fi + if ! [ "$KSU_VER_CODE" ] || [ "$KSU_VER_CODE" -lt "$MIN_KSUD_VERSION" ]; then + ui_print "*********************************************************" + ui_print "! ksud version is too old!" + ui_print "! Please update KernelSU Manager to latest version" + abort "*********************************************************" + fi elif [ "$BOOTMODE" ] && [ "$MAGISK_VER_CODE" ]; then ui_print "- Installing from Magisk app" if [ "$MAGISK_VER_CODE" -lt "$MIN_MAGISK_VERSION" ]; then