From a5aa86ec31cb72424dab0760a94fad8146077184 Mon Sep 17 00:00:00 2001 From: vvb2060 Date: Tue, 11 May 2021 18:23:12 +0800 Subject: [PATCH] [core] Show incompatible frameworks id (#564) --- core/magisk_module/util_functions.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/core/magisk_module/util_functions.sh b/core/magisk_module/util_functions.sh index 761588dc..6f68d0f5 100644 --- a/core/magisk_module/util_functions.sh +++ b/core/magisk_module/util_functions.sh @@ -45,13 +45,13 @@ check_android_version() { check_incompatible_module() { MODULEDIR="$(magisk --path)/.magisk/modules" - FINDMODULE=false for id in "riru_dreamland" "riru_edxposed" "riru_edxposed_sandhook" "taichi"; do - [ -d $MODULEDIR/$id ] && [ ! -f $MODULEDIR/$id/disable ] && FINDMODULE=true + if [ -d "$MODULEDIR/$id" ] && [ ! -f "$MODULEDIR/$id/disable" ]; then + ui_print "*********************************************************" + ui_print "! Please disable or uninstall incompatible frameworks:" + ui_print "! $id" + abort "*********************************************************" + break + fi done - if $FINDMODULE; then - ui_print "*********************************************************" - ui_print "! Please disable or uninstall incompatible frameworks (Dreamland, EdXposed or Taichi)" - abort "*********************************************************" - fi }