From 3faf9ee1cb9a97f2af0ae495de25c93d42ee7315 Mon Sep 17 00:00:00 2001 From: androidacy-user Date: Thu, 27 Apr 2023 12:24:36 +0000 Subject: [PATCH] (fix) small fixes again Signed-off-by: androidacy-user --- .../com/fox2code/mmm/installer/InstallerInitializer.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/fox2code/mmm/installer/InstallerInitializer.java b/app/src/main/java/com/fox2code/mmm/installer/InstallerInitializer.java index 3575378..3c2b7a3 100644 --- a/app/src/main/java/com/fox2code/mmm/installer/InstallerInitializer.java +++ b/app/src/main/java/com/fox2code/mmm/installer/InstallerInitializer.java @@ -112,18 +112,18 @@ public class InstallerInitializer extends Shell.Initializer { boolean HAS_RAMDISK = InstallerInitializer.HAS_RAMDISK; if (MAGISK_PATH != null && !forceCheck) return MAGISK_PATH; ArrayList output = new ArrayList<>(); - if (!Shell.cmd("if grep ' / ' /proc/mounts | grep -q '/dev/root' &> /dev/null; " + "then echo true; else echo false; fi", "magisk -V", "magisk --path").to(output).exec().isSuccess()) { + if (!Shell.cmd("magisk -V", "magisk --path").to(output).exec().isSuccess()) { if (output.size() != 0) { HAS_RAMDISK = "false".equals(output.get(0)) || "true".equalsIgnoreCase(System.getProperty("ro.build.ab_update")); } InstallerInitializer.HAS_RAMDISK = HAS_RAMDISK; return null; } - MAGISK_PATH = output.size() < 3 ? "" : output.get(2); + MAGISK_PATH = output.size() < 2 ? "" : output.get(1); Timber.i("Magisk runtime path: %s", MAGISK_PATH); - MAGISK_VERSION_CODE = Integer.parseInt(output.get(1)); + MAGISK_VERSION_CODE = Integer.parseInt(output.get(0)); Timber.i("Magisk version code: %s", MAGISK_VERSION_CODE); - if (MAGISK_VERSION_CODE >= Constants.MAGISK_VER_CODE_FLAT_MODULES && MAGISK_VERSION_CODE < Constants.MAGISK_VER_CODE_PATH_SUPPORT && (MAGISK_PATH.isEmpty() || !new File(MAGISK_PATH).exists())) { + if (MAGISK_VERSION_CODE >= Constants.MAGISK_VER_CODE_FLAT_MODULES && MAGISK_VERSION_CODE < Constants.MAGISK_VER_CODE_PATH_SUPPORT && (MAGISK_PATH.isEmpty() || !Files.existsSU(new File(MAGISK_PATH)))) { MAGISK_PATH = "/sbin"; } if (MAGISK_PATH.length() != 0 && Files.existsSU(new File(MAGISK_PATH))) {