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

Update busybox version and bug fixes

Browse Source
This commit is contained in:
topjohnwu 2017-07-31 00:21:18 +08:00
parent 9df6b9d5c0
commit 5716218f41
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,7 @@ public class MagiskManager extends Application {
public static final String INTENT_SECTION = "section"; public static final String INTENT_SECTION = "section";
public static final String INTENT_VERSION = "version"; public static final String INTENT_VERSION = "version";
public static final String INTENT_LINK = "link"; public static final String INTENT_LINK = "link";
public static final String BUSYBOX_VERSION = "1.26.2"; public static final String BUSYBOX_VERSION = "1.27.1";
public static final String MAGISKHIDE_PROP = "persist.magisk.hide"; public static final String MAGISKHIDE_PROP = "persist.magisk.hide";
public static final String DISABLE_INDICATION_PROP = "ro.magisk.disable"; public static final String DISABLE_INDICATION_PROP = "ro.magisk.disable";
public static final String NOTIFICATION_CHANNEL = "magisk_update_notice"; public static final String NOTIFICATION_CHANNEL = "magisk_update_notice";
@ -165,6 +165,7 @@ public class MagiskManager extends Application {
// Initialize busybox // Initialize busybox
File busybox = new File(getApplicationInfo().dataDir + "/busybox/busybox"); File busybox = new File(getApplicationInfo().dataDir + "/busybox/busybox");
if (!busybox.exists() || !TextUtils.equals(prefs.getString("busybox_version", ""), BUSYBOX_VERSION)) { if (!busybox.exists() || !TextUtils.equals(prefs.getString("busybox_version", ""), BUSYBOX_VERSION)) {
shell.su("rm -rf " + busybox.getParentFile());
busybox.getParentFile().mkdirs(); busybox.getParentFile().mkdirs();
shell.su_raw( shell.su_raw(
"cp -f " + new File(getApplicationInfo().nativeLibraryDir, "libbusybox.so") + " " + busybox, "cp -f " + new File(getApplicationInfo().nativeLibraryDir, "libbusybox.so") + " " + busybox,
@ -189,7 +190,7 @@ public class MagiskManager extends Application {
.putString("busybox_version", BUSYBOX_VERSION) .putString("busybox_version", BUSYBOX_VERSION)
.apply(); .apply();
// Add busybox to PATH // Add busybox to PATH
shell.su_raw("PATH=$PATH:" + busybox.getParent()); shell.su_raw("PATH=" + busybox.getParent() + ":$PATH");
// Create notification channel on Android O // Create notification channel on Android O
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {

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

@ -106,6 +106,7 @@ public class Shell {
synchronized (shellProcess) { synchronized (shellProcess) {
try { try {
for (String command : commands) { for (String command : commands) {
Logger.shell(command);
STDIN.write((command + "\n").getBytes("UTF-8")); STDIN.write((command + "\n").getBytes("UTF-8"));
STDIN.flush(); STDIN.flush();
} }
@ -127,7 +128,7 @@ public class Shell {
// This should be the expected result // This should be the expected result
} }
synchronized (shellProcess) { synchronized (shellProcess) {
StreamGobbler out = new StreamGobbler(this.STDOUT, output); StreamGobbler out = new StreamGobbler(STDOUT, output);
out.start(); out.start();
sh_raw(commands); sh_raw(commands);
sh_raw("echo \'-shell-done-\'"); sh_raw("echo \'-shell-done-\'");