Skip to content

Commit e54569d

Browse files
authored
Merge pull request #70 from bobrofon/no-busybox
Remove bundled BusyBox binaries
2 parents 6dd6da2 + 2f525c1 commit e54569d

2 files changed

Lines changed: 1 addition & 5 deletions

File tree

app/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,6 @@ dependencies {
9494
// implementation "com.github.topjohnwu.libsu:service:${libsuVersion}"
9595
// Optional: For com.topjohnwu.superuser.io classes
9696
// implementation "com.github.topjohnwu.libsu:io:${libsuVersion}"
97-
// Optional: Bundle prebuilt BusyBox binaries
98-
implementation "com.github.topjohnwu.libsu:busybox:${libsuVersion}"
9997
}
10098

10199
def signingPropsFile = file("signing.properties")

app/src/main/java/ru/nsu/bobrofon/easysshfs/ShellBuilder.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
// SPDX-License-Identifier: MIT
12
package ru.nsu.bobrofon.easysshfs
23

34
import android.util.Log
4-
import com.topjohnwu.superuser.BusyBoxInstaller
55
import com.topjohnwu.superuser.Shell
66
import com.topjohnwu.superuser.Shell.Builder
77
import ru.nsu.bobrofon.easysshfs.log.AppLog
@@ -26,7 +26,6 @@ object ShellBuilder {
2626

2727
private fun build(): Shell {
2828
val builder = Builder.create()
29-
.setInitializers(BusyBoxInstaller::class::java.get())
3029

3130
return if (isMagiskV27x()) {
3231
// TODO: remove logging after the following release (or maybe a few releases)
@@ -45,7 +44,6 @@ object ShellBuilder {
4544

4645
private fun isMagiskV27x(): Boolean {
4746
val sh = Builder.create()
48-
.setInitializers(BusyBoxInstaller::class::java.get())
4947
.setFlags(Shell.FLAG_NON_ROOT_SHELL)
5048
.build()
5149

0 commit comments

Comments
 (0)