Support fixing Magisk environment

altr0n · May 13, 2018 · c9ca42a · c9ca42a
1 parent c0e2f44
commit c9ca42a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/app b/app
diff --git a/build.gradle b/build.gradle
@@ -25,7 +25,7 @@ allprojects {
 
 ext {
     compileSdkVersion = 27
-    buildToolsVersion = "28.0.0-rc1"
+    buildToolsVersion = "28.0.0-rc2"
     supportLibVersion = "27.1.1"
 }
 

diff --git a/native/jni/core/bootstages.c b/native/jni/core/bootstages.c
@@ -629,12 +629,15 @@ void startup() {
 #endif
 	}
 	xmkdirs(MIRRDIR "/bin", 0755);
+	xmkdirs(DATABIN, 0755);
 	bind_mount(DATABIN, MIRRDIR "/bin");
 
-	LOGI("* Setting up internal busybox");
 	xmkdirs(BBPATH, 0755);
-	exec_command_sync(MIRRDIR "/bin/busybox", "--install", "-s", BBPATH, NULL);
-	xsymlink(MIRRDIR "/bin/busybox", BBPATH "/busybox");
+	if (access(MIRRDIR "/bin/busybox", X_OK) == 0) {
+		LOGI("* Setting up internal busybox");
+		exec_command_sync(MIRRDIR "/bin/busybox", "--install", "-s", BBPATH, NULL);
+		xsymlink(MIRRDIR "/bin/busybox", BBPATH "/busybox");
+	}
 
 	// uninstall
 	if (access(UNINSTALLER, F_OK) == 0) {
+2 −2		build.gradle
+10 −5		src/main/java/com/topjohnwu/magisk/MagiskFragment.java
+5 −4		src/main/java/com/topjohnwu/magisk/MagiskManager.java
+244 −169		src/main/java/com/topjohnwu/magisk/asyncs/InstallMagisk.java
+21 −11		src/main/java/com/topjohnwu/magisk/asyncs/UpdateRepos.java
+1 −1		src/main/java/com/topjohnwu/magisk/container/Module.java
+5 −4		src/main/java/com/topjohnwu/magisk/container/Repo.java
+2 −2		src/main/java/com/topjohnwu/magisk/database/RepoDatabaseHelper.java
+3 −1		src/main/java/com/topjohnwu/magisk/utils/Const.java
+21 −0		src/main/java/com/topjohnwu/magisk/utils/ShowUI.java
+13 −0		src/main/java/com/topjohnwu/magisk/utils/Utils.java
+6 −5		src/main/java/com/topjohnwu/magisk/utils/WebService.java
+9 −5		src/main/java/com/topjohnwu/magisk/utils/ZipUtils.java
+7 −0		src/main/res/raw/utils.sh
+2 −0		src/main/res/values-de/strings.xml
+3 −0		src/main/res/values-es/strings.xml
+42 −40		src/main/res/values-fr/strings.xml
+2 −0		src/main/res/values-in/strings.xml
+2 −0		src/main/res/values-it/strings.xml
+12 −10		src/main/res/values-lt/strings.xml
+2 −0		src/main/res/values-nl/strings.xml
+10 −8		src/main/res/values-pl/strings.xml
+1 −1		src/main/res/values-sr/strings.xml
+7 −5		src/main/res/values-tr/strings.xml
+2 −0		src/main/res/values-uk/strings.xml
+3 −1		src/main/res/values-zh-rCN/strings.xml
+4 −0		src/main/res/values/strings.xml