TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-10-17 01:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate path /sbin/.core, switch to /sbin/.magisk

Browse Source 
Symlink is preserved for backwards compatibility
This commit is contained in:
topjohnwu
2018-11-15 01:36:03 -05:00
parent 83ae66daea
commit 376e7977f0
7 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/full/java/com/topjohnwu/magisk/Const.java
View File

@@ -27,7 +27,7 @@ public class Const {
MAGISK_PATH = MAGISK_DISABLE_FILE = MAGISK_HOST_FILE = new File("xxx");
}
public static final String BUSYBOX_PATH = "/sbin/.core/busybox";
public static final String BUSYBOX_PATH = "/sbin/.magisk/busybox";
public static final String TMP_FOLDER_PATH = "/dev/tmp";
public static final String MAGISK_LOG = "/cache/magisk.log";
public static final String MANAGER_CONFIGS = ".tmp.magisk.config";

2
app/src/full/java/com/topjohnwu/magisk/database/MagiskDB.java
View File

@@ -20,7 +20,7 @@ public class MagiskDB {
static final String SETTINGS_TABLE = "settings";
static final String STRINGS_TABLE = "strings";
static final File LEGACY_MANAGER_DB =
new File(Utils.fmt("/sbin/.core/db-%d/magisk.db", Const.USER_ID));
new File(Utils.fmt("/sbin/.magisk/db-%d/magisk.db", Const.USER_ID));
@NonNull
public static MagiskDB getInstance() {

5
app/src/full/java/com/topjohnwu/magisk/utils/RootUtils.java
View File

@@ -29,12 +29,15 @@ public class RootUtils extends Shell.Initializer {
public boolean onInit(Context context, @NonNull Shell shell) {
Shell.Job job = shell.newJob();
if (shell.isRoot()) {
if (!new SuFile("/sbin/.magisk").exists())
job.add("ln -s /sbin/.core /sbin/.magisk");
InputStream magiskUtils = context.getResources().openRawResource(R.raw.util_functions);
InputStream managerUtils = context.getResources().openRawResource(R.raw.utils);
job.add(magiskUtils).add(managerUtils);
Const.MAGISK_DISABLE_FILE = new SuFile("/cache/.disable_magisk");
SuFile file = new SuFile("/sbin/.core/img");
SuFile file = new SuFile("/sbin/.magisk/img");
if (file.exists()) {
Const.MAGISK_PATH = file;
} else if ((file = new SuFile("/dev/magisk/img")).exists()) {