MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update to use new paths

Browse Source
This commit is contained in:
topjohnwu 2017-11-22 14:03:08 +08:00
parent 7273a1c34d
commit f520fe36bd
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/topjohnwu/magisk/SettingsActivity.java
View File

@ -130,10 +130,7 @@ public class SettingsActivity extends Activity implements Topic.Subscriber {
.setPositiveButton(R.string.ok, (d, i) -> { .setPositiveButton(R.string.ok, (d, i) -> {
prefs.edit().putString(Const.Key.CUSTOM_CHANNEL, url.getText().toString()).apply(); prefs.edit().putString(Const.Key.CUSTOM_CHANNEL, url.getText().toString()).apply();
}) })
.setNegativeButton(R.string.close, (d, i) -> { .setNegativeButton(R.string.close, null)
mm.updateChannel = Const.Value.STABLE_CHANNEL;
prefs.edit().putString(Const.Key.UPDATE_CHANNEL, String.valueOf(Const.Value.STABLE_CHANNEL)).apply();
})
.show(); .show();
} }
return true; return true;

13
app/src/main/java/com/topjohnwu/magisk/utils/Const.java
View File

@ -24,11 +24,20 @@ public class Const {
public static final String MAGISK_DISABLE_FILE = "/cache/.disable_magisk"; public static final String MAGISK_DISABLE_FILE = "/cache/.disable_magisk";
public static final String TMP_FOLDER_PATH = "/dev/tmp"; public static final String TMP_FOLDER_PATH = "/dev/tmp";
public static final String MAGISK_LOG = "/cache/magisk.log"; public static final String MAGISK_LOG = "/cache/magisk.log";
public static final String BUSYBOX_PATH = "/dev/magisk/bin";
public static final File EXTERNAL_PATH = new File(Environment.getExternalStorageDirectory(), "MagiskManager"); public static final File EXTERNAL_PATH = new File(Environment.getExternalStorageDirectory(), "MagiskManager");
public static String BUSYBOX_PATH() {
if (Utils.itemExist("/sbin/.core/busybox/busybox")) {
return "/sbin/.core/busybox";
} else {
return "/dev/magisk/bin";
}
}
public static String MAGISK_PATH() { public static String MAGISK_PATH() {
if (Utils.itemExist("/dev/magisk/img")) { if (Utils.itemExist("/sbin/.core/img")) {
return "/sbin/.core/img";
} else if (Utils.itemExist("/dev/magisk/img")) {
return "/dev/magisk/img"; return "/dev/magisk/img";
} else { } else {
return "/magisk"; return "/magisk";

3
app/src/main/java/com/topjohnwu/magisk/utils/Shell.java
View File

@ -89,8 +89,9 @@ public class Shell {
} }
// Root shell initialization // Root shell initialization
String bbpath = Const.BUSYBOX_PATH();
mm.shell.run_raw(false, false, mm.shell.run_raw(false, false,
"export PATH=" + Const.BUSYBOX_PATH + ":$PATH", "export PATH=" + bbpath + ":$PATH",
"mount_partitions", "mount_partitions",
"find_boot_image", "find_boot_image",
"migrate_boot_backup"); "migrate_boot_backup");