From 6f74ed6cebe3d1f5a69ee53e91ac4616ddb88440 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Mon, 13 Jun 2022 01:21:24 -0700 Subject: [PATCH] Cleanup manager.sh --- app/src/main/res/raw/manager.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/raw/manager.sh b/app/src/main/res/raw/manager.sh index 368d87c86..65bccf94e 100644 --- a/app/src/main/res/raw/manager.sh +++ b/app/src/main/res/raw/manager.sh @@ -10,7 +10,7 @@ env_check() { for file in busybox magiskboot magiskinit util_functions.sh boot_patch.sh; do [ -f "$MAGISKBIN/$file" ] || return 1 done - if [ "$2" -ge 24302 ]; then + if [ "$2" -ge 25000 ]; then [ -f "$MAGISKBIN/magiskpolicy" ] || return 1 fi grep -xqF "MAGISK_VER='$1'" "$MAGISKBIN/util_functions.sh" || return 1 @@ -206,7 +206,8 @@ get_flags() { fi # Preset PATCHVBMETAFLAG to false in the non-root case PATCHVBMETAFLAG=false - # Do NOT preset RECOVERYMODE here + # Make sure RECOVERYMODE has value + [ -z $RECOVERYMODE ] && RECOVERYMODE=false } run_migrations() { return; } @@ -225,8 +226,6 @@ app_init() { run_migrations SHA1=$(grep_prop SHA1 $MAGISKTMP/config) check_encryption - # Make sure RECOVERYMODE has value - [ -z $RECOVERYMODE ] && RECOVERYMODE=false } export BOOTMODE=true