Skip to content

Commit b9642ab

Browse files
committed
Refactoring and improvements
1 parent 4ac309d commit b9642ab

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+290
-671
lines changed

LICENSE

+23-18
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,8 @@ to attach them to the start of each source file to most effectively
290290
convey the exclusion of warranty; and each file should have at least
291291
the "copyright" line and a pointer to where the full notice is found.
292292

293-
The application is an BusyBox installer for Android.
294-
Copyright (C) 2015 Anton Skshidlevsky
293+
<one line to give the program's name and a brief idea of what it does.>
294+
Copyright (C) <year> <name of author>
295295

296296
This program is free software; you can redistribute it and/or modify
297297
it under the terms of the GNU General Public License as published by
@@ -312,23 +312,28 @@ Also add information on how to contact you by electronic and paper mail.
312312
If the program is interactive, make it output a short notice like this
313313
when it starts in an interactive mode:
314314

315-
BusyBox Copyright (C) 2012 Anton Skshidlevsky
316-
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
315+
Gnomovision version 69, Copyright (C) year name of author
316+
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
317317
This is free software, and you are welcome to redistribute it
318318
under certain conditions; type `show c' for details.
319319

320320
The hypothetical commands `show w' and `show c' should show the appropriate
321-
parts of the General Public License. Of course, your program's commands
322-
might be different; for a GUI interface, you would use an "about box".
323-
324-
You should also get your employer (if you work as a programmer) or school,
325-
if any, to sign a "copyright disclaimer" for the program, if necessary.
326-
For more information on this, and how to apply and follow the GNU GPL, see
327-
<http://www.gnu.org/licenses/>.
328-
329-
The GNU General Public License does not permit incorporating your program
330-
into proprietary programs. If your program is a subroutine library, you
331-
may consider it more useful to permit linking proprietary applications with
332-
the library. If this is what you want to do, use the GNU Lesser General
333-
Public License instead of this License. But first, please read
334-
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
321+
parts of the General Public License. Of course, the commands you use may
322+
be called something other than `show w' and `show c'; they could even be
323+
mouse-clicks or menu items--whatever suits your program.
324+
325+
You should also get your employer (if you work as a programmer) or your
326+
school, if any, to sign a "copyright disclaimer" for the program, if
327+
necessary. Here is a sample; alter the names:
328+
329+
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
330+
`Gnomovision' (which makes passes at compilers) written by James Hacker.
331+
332+
<signature of Ty Coon>, 1 April 1989
333+
Ty Coon, President of Vice
334+
335+
This General Public License does not permit incorporating your program into
336+
proprietary programs. If your program is a subroutine library, you may
337+
consider it more useful to permit linking proprietary applications with the
338+
library. If this is what you want to do, use the GNU Lesser General
339+
Public License instead of this License.

README.md

+9-15
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
11
# BusyBox
22

3-
Copyright (C) 2015-2022 Anton Skshidlevsky, GPLv2
3+
Copyright (C) 2015 Anton Skshidlevsky, GPLv2
44

5-
This application is an BusyBox installer for Android.
5+
This application is a BusyBox installer for Android.
66

77
[BusyBox](http://busybox.net) combines tiny versions of many common UNIX utilities into a single small executable. It provides replacements for most of the utilities you usually find in GNU fileutils, shellutils, etc. The utilities in BusyBox generally have fewer options than their full-featured GNU cousins; however, the options that are included provide the expected functionality and behave very much like their GNU counterparts. BusyBox provides a fairly complete environment for any small or embedded system.
88

9-
The app is available for download in Google Play and GitHub.
9+
The app is available for download on Google Play and GitHub:
1010

1111
<a href="https://play.google.com/store/apps/details?id=ru.meefik.busybox"><img src="https://gist.githubusercontent.com/meefik/54a54afa7cc1dc600bdb855cb7895a4a/raw/ad617c006a1ac28d067c9a87cec60199ca8fef7c/get-it-on-google-play.png" alt="Get it on Google Play"></a>
1212
<a href="https://github.com/meefik/busybox/releases/latest"><img src="https://gist.githubusercontent.com/meefik/54a54afa7cc1dc600bdb855cb7895a4a/raw/ad617c006a1ac28d067c9a87cec60199ca8fef7c/get-apk-from-github.png" alt="Get it on Github"></a>
1313

14+
**Requirements**:
15+
16+
- Device with architecture arm, arm64, x86, x86_64
17+
- Android 5 (API 21) or later
18+
- Superuser permissions (root)
19+
1420
Latest BusyBox v1.34.1, supported 378 applets:
1521

1622
[, [[, acpid, adjtimex, ar, arch, arp, ascii, ash, awk, base32, base64, basename,
@@ -48,15 +54,3 @@ Latest BusyBox v1.34.1, supported 378 applets:
4854
unexpand, uniq, unix2dos, unlink, unlzma, unlzop, unshare, unxz, unzip, uptime, usleep,
4955
uudecode, uuencode, vconfig, vi, volname, watch, watchdog, wc, wget, which, whoami,
5056
whois, xargs, xxd, xz, xzcat, yes, zcat, zcip
51-
52-
**Requirements**:
53-
54-
* Device with architecture arm, arm64, x86, x86_64
55-
* Android 8 (API 26) or later
56-
* Superuser permissions (root)
57-
58-
**References**:
59-
60-
* [Source code](https://github.com/meefik/busybox)
61-
* [Releases](https://github.com/meefik/busybox/releases)
62-
* [Donations](https://meefik.github.io/donate)

app/build.gradle

+16-13
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 31
5-
buildToolsVersion '31.0.0'
4+
compileSdkVersion 33
5+
buildToolsVersion '33.0.2'
66

77
defaultConfig {
88
applicationId 'ru.meefik.busybox'
9-
minSdkVersion 26
10-
targetSdkVersion 31
11-
versionCode 51
9+
minSdkVersion 21
10+
targetSdkVersion 33
11+
versionCode 52
1212
versionName '1.34.1'
1313
}
1414
buildTypes {
@@ -18,30 +18,33 @@ android {
1818
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1919
}
2020
}
21-
lintOptions {
22-
disable 'MissingTranslation'
23-
disable 'ExtraTranslation'
24-
}
2521
compileOptions {
2622
sourceCompatibility JavaVersion.VERSION_1_8
2723
targetCompatibility JavaVersion.VERSION_1_8
2824
}
2925
packagingOptions {
30-
doNotStrip '**/*'
31-
exclude 'jniLibs/all/*'
3226
jniLibs {
3327
useLegacyPackaging true
28+
keepDebugSymbols += ['**/*']
29+
excludes += ['jniLibs/all/*']
30+
}
31+
resources {
32+
excludes += ['jniLibs/all/*']
3433
}
3534
}
35+
namespace 'ru.meefik.busybox'
36+
lint {
37+
disable 'MissingTranslation', 'ExtraTranslation'
38+
}
3639
}
3740

3841
repositories {
3942
maven { url 'https://jitpack.io' }
4043
}
4144

4245
dependencies {
43-
implementation 'androidx.appcompat:appcompat:1.4.0'
44-
implementation 'com.github.topjohnwu.libsu:core:3.2.1'
46+
implementation 'androidx.appcompat:appcompat:1.6.1'
47+
implementation 'com.github.topjohnwu.libsu:core:5.0.5'
4548
}
4649

4750
tasks.matching { it.name == "extractReleaseNativeSymbolTables" }.configureEach {

app/src/main/AndroidManifest.xml

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="ru.meefik.busybox"
43
android:extractNativeLibs="true"
54
android:installLocation="internalOnly">
65

@@ -21,7 +20,6 @@
2120
<activity
2221
android:name=".MainActivity"
2322
android:exported="true"
24-
android:label="@string/app_name"
2523
android:launchMode="singleTop">
2624
<intent-filter>
2725
<action android:name="android.intent.action.MAIN" />

app/src/main/_libs/all/addon_d.sh

-62
This file was deleted.

app/src/main/_libs/all/info.sh

-78
This file was deleted.

0 commit comments

Comments
 (0)