From 9396288ca29e807938e0527473a58dc834079c81 Mon Sep 17 00:00:00 2001 From: vvb2060 Date: Wed, 26 May 2021 01:48:32 +0800 Subject: [PATCH] Check util_functions.sh version --- app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt | 2 +- app/src/main/res/raw/manager.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt index 35f4d6f7b..5251b663e 100644 --- a/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt +++ b/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt @@ -145,7 +145,7 @@ class HomeViewModel( ) if (invalidStates.any { it == stateMagisk } || shownDialog) return - val result = Shell.su("env_check").await() + val result = Shell.su("env_check ${Info.env.magiskVersionString} ${Info.env.magiskVersionCode}").await() if (!result.isSuccess) { shownDialog = true EnvFixDialog().publish() diff --git a/app/src/main/res/raw/manager.sh b/app/src/main/res/raw/manager.sh index 0aa513d5a..873879aac 100644 --- a/app/src/main/res/raw/manager.sh +++ b/app/src/main/res/raw/manager.sh @@ -10,6 +10,8 @@ env_check() { for file in busybox magiskboot magiskinit util_functions.sh boot_patch.sh; do [ -f $MAGISKBIN/$file ] || return 1 done + grep -xqF "MAGISK_VER='$1'" "$MAGISKBIN/util_functions.sh" || return 1 + grep -xqF "MAGISK_VER_CODE=$2" "$MAGISKBIN/util_functions.sh" || return 1 return 0 }