From 78df677a42a01f311bd6177f737cb80badeca976 Mon Sep 17 00:00:00 2001 From: vvb2060 Date: Mon, 13 Feb 2023 02:15:37 +0800 Subject: [PATCH] Use /data/adb/modules directly --- app/src/main/java/com/topjohnwu/magisk/core/Const.kt | 3 +-- app/src/main/java/com/topjohnwu/magisk/core/utils/ShellInit.kt | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/main/java/com/topjohnwu/magisk/core/Const.kt b/app/src/main/java/com/topjohnwu/magisk/core/Const.kt index 42b3691b2..882a3c3ee 100644 --- a/app/src/main/java/com/topjohnwu/magisk/core/Const.kt +++ b/app/src/main/java/com/topjohnwu/magisk/core/Const.kt @@ -15,8 +15,7 @@ object Const { else Build.SUPPORTED_32_BIT_ABIS.firstOrNull() // Paths - lateinit var MAGISKTMP: String - val MAGISK_PATH get() = "$MAGISKTMP/modules" + const val MAGISK_PATH = "/data/adb/modules" const val TMPDIR = "/dev/tmp" const val MAGISK_LOG = "/cache/magisk.log" diff --git a/app/src/main/java/com/topjohnwu/magisk/core/utils/ShellInit.kt b/app/src/main/java/com/topjohnwu/magisk/core/utils/ShellInit.kt index 12cb99d4f..c18a3dbff 100644 --- a/app/src/main/java/com/topjohnwu/magisk/core/utils/ShellInit.kt +++ b/app/src/main/java/com/topjohnwu/magisk/core/utils/ShellInit.kt @@ -73,7 +73,6 @@ class ShellInit : Shell.Initializer() { fun getVar(name: String) = fastCmd("echo \$$name") fun getBool(name: String) = getVar(name).toBoolean() - Const.MAGISKTMP = getVar("MAGISKTMP") Info.isSAR = getBool("SYSTEM_ROOT") Info.ramdisk = getBool("RAMDISKEXIST") Info.vbmeta = getBool("VBMETAEXIST")