Skip to content

Commit e2c1dcf

Browse files
committed
chore: sync with microG unofficial installer
Signed-off-by: ale5000 <15793015+ale5000-git@users.noreply.github.com>
1 parent 6666761 commit e2c1dcf

20 files changed

Lines changed: 91 additions & 92 deletions

.github/workflows/coverage.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ jobs:
3838
timeout-minutes: 10
3939
with:
4040
ruby-version: "3.4"
41+
bundler-cache: "true"
4142
- name: "Install Bashcov and simplecov-lcov"
4243
shell: bash
4344
timeout-minutes: 10

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
/.ssh/
1111
/coverage/
1212
/dependency-graph-reports/
13+
/vendor/
1314
/.ash_history
1415
/.bash_history
1516
/.lesshst

Gemfile.lock

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,18 @@ GEM
1313
simplecov_json_formatter (0.1.4)
1414

1515
PLATFORMS
16+
arm64-darwin
1617
ruby
18+
x64-mingw-ucrt
19+
x86_64-darwin
20+
x86_64-linux
1721

1822
DEPENDENCIES
1923
bashcov (>= 3.2)
2024
simplecov-lcov
2125

26+
RUBY VERSION
27+
ruby 3.4.5p51
28+
2229
BUNDLED WITH
23-
2.5.23
30+
2.7.2

REUSE.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ version = 1
22

33
[[annotations]]
44
path = [
5-
".public-keys/*.gpg",
6-
"fastlane/metadata/android/en-US/*.txt",
7-
"gradle/wrapper/gradle-wrapper.properties",
8-
"allowed_signers",
9-
"Gemfile.lock"
5+
".public-keys/*.gpg",
6+
"fastlane/metadata/android/en-US/*.txt",
7+
"gradle/wrapper/gradle-wrapper.properties",
8+
"allowed_signers",
9+
"Gemfile.lock"
1010
]
1111
SPDX-FileCopyrightText = "NONE"
1212
SPDX-License-Identifier = "CC0-1.0"

includes/common.sh

Lines changed: 39 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,6 +1010,33 @@ dl_list()
10101010
done
10111011
}
10121012

1013+
ruby_update_all()
1014+
{
1015+
is_root || {
1016+
ui_error_msg 'You must execute this as root'
1017+
return 1
1018+
}
1019+
1020+
ui_debug 'Installing / updating rubygems-update...'
1021+
if gem 1> /dev/null list -i '^rubygems-update$'; then
1022+
gem update rubygems-update || ui_warning 'Failed to update rubygems-update'
1023+
else
1024+
gem install rubygems-update || ui_warning 'Failed to install rubygems-update'
1025+
fi
1026+
ui_debug ''
1027+
1028+
ui_debug 'Running update_rubygems...'
1029+
update_rubygems 1> /dev/null || ui_warning 'Failed to execute => update_rubygems'
1030+
ui_debug 'Running gem update --system...'
1031+
gem update --system || ui_warning 'Failed to execute => gem update --system'
1032+
ui_debug ''
1033+
ui_debug 'Running gem update...'
1034+
gem update || ui_warning 'Failed to execute => gem update'
1035+
ui_debug ''
1036+
ui_debug 'Running gem cleanup...'
1037+
gem cleanup || ui_warning 'Failed to execute => gem cleanup'
1038+
}
1039+
10131040
get_32bit_programfiles()
10141041
{
10151042
local _dir
@@ -1214,6 +1241,13 @@ init_path()
12141241
if test -n "${PATH-}"; then PATH="${PATH%"${PATHSEP:?}"}"; fi
12151242

12161243
if test "${PLATFORM:?}" = 'win'; then
1244+
# Make some GNU tools available
1245+
local _program_dir_32
1246+
_program_dir_32="$(get_32bit_programfiles)"
1247+
if test -n "${_program_dir_32?}"; then
1248+
add_to_path_env "${_program_dir_32:?}/GnuWin32/bin"
1249+
fi
1250+
12171251
# On Bash under Windows (for example the one included inside Git for Windows) we need to have '/usr/bin'
12181252
# before 'C:/Windows/System32' otherwise it will use the find/sort/etc. of Windows instead of the Unix compatible ones.
12191253
# ADDITIONAL NOTE: We have to do this even under BusyBox otherwise every external bash/make executed as subshell of BusyBox will be broken.
@@ -1223,13 +1257,6 @@ init_path()
12231257
else
12241258
PATH="/usr/bin${PATHSEP:?}${PATH:?}"
12251259
fi
1226-
1227-
# Make some GNU tools available
1228-
local _program_dir_32
1229-
_program_dir_32="$(get_32bit_programfiles)"
1230-
if test -n "${_program_dir_32?}"; then
1231-
add_to_path_env "${_program_dir_32:?}/GnuWin32/bin"
1232-
fi
12331260
fi
12341261

12351262
if test "${DO_INIT_CMDLINE:-0}" != '0'; then remove_duplicates_from_path_env; fi
@@ -1323,11 +1350,6 @@ init_cmdline()
13231350

13241351
if test "${PLATFORM:?}" = 'win'; then unset JAVA_HOME; fi
13251352

1326-
# Clean useless directories from the $PATH env
1327-
if test "${PLATFORM?}" = 'win'; then
1328-
remove_from_path_env "${LOCALAPPDATA-}/Microsoft/WindowsApps"
1329-
fi
1330-
13311353
# Set environment variables
13321354
readonly UTILS_DIR="${MAIN_DIR:?}/utils"
13331355
readonly UTILS_DATA_DIR="${UTILS_DIR:?}/data"
@@ -1459,6 +1481,11 @@ init_cmdline()
14591481
HOME="${USER_HOME:-${HOME:?}}" command -- gpg "${@}"
14601482
}
14611483

1484+
gem()
1485+
{
1486+
HOME="${USER_HOME:-${HOME:?}}" command -- gem "${@}"
1487+
}
1488+
14621489
bundle()
14631490
{
14641491
HOME="${USER_HOME:-${HOME:?}}" command -- bundle "${@}"

tools/README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ TOOLS
99

1010
- zipsigner_ **3.0** => zipsigner.jar
1111
- zipsigner_ **3.0** (Dalvik) => zipsigner-dvk.jar
12-
- `BusyBox for Windows`_ **1.38.0-PRE-5759-g2c94f4417 (2025-08-28)** => win/busybox.exe
12+
- `BusyBox for Windows`_ **1.38.0-PRE-5781-gee5f89098 (2025-09-09)** => win/busybox.exe
1313
- `BusyBox legacy for Windows`_ **1.21.0-TIG-931-g7e6a84d (2012-11-29)** => win/busybox-legacy.bin
1414
- Zip_ **3.0** => win/zip.exe
1515
- UnZip_ **6.0** => win/unzip.exe

tools/win/busybox.exe

512 Bytes
Binary file not shown.

zip-content/META-INF/REUSE.toml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
# -*- coding: utf-8; mode: conf-toml -*-
21
version = 1
32

43
[[annotations]]
54
path = [
6-
"CERT.RSA",
7-
"CERT.SF",
8-
"MANIFEST.MF",
9-
"com/google/android/updater-script*"
5+
"com/google/android/updater-script*",
6+
"CERT.RSA",
7+
"CERT.SF",
8+
"MANIFEST.MF"
109
]
1110
SPDX-FileCopyrightText = "NONE"
1211
SPDX-License-Identifier = "CC0-1.0"

zip-content/misc/README.rst

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
..
2-
SPDX-FileCopyrightText: (c) 2016 ale5000
3-
SPDX-License-Identifier: GPL-3.0-or-later
2+
SPDX-FileCopyrightText: NONE
3+
SPDX-License-Identifier: CC0-1.0
44
SPDX-FileType: DOCUMENTATION
55
6-
=====
7-
TOOLS
8-
=====
9-
10-
- `Android Asset Packaging Tool`_ **0.2-2a587ba28f** (AAPT) => aapt/aapt-*.bin
11-
- `BusyBox for Android`_ **1.29.2-YDS-201808012015** (compiled by `@YashdSaraf <https://github.com/yashdsaraf>`_) => busybox/busybox-*.bin
6+
====
7+
MISC
8+
====
129

10+
- `Android Asset Packaging Tool`_ **0.2-2a587ba28f** (AAPT) => aapt/aapt-\*.bin
11+
- `BusyBox for Android`_ **1.29.2-YDS-201808012015** (`original thread <https://xdaforums.com/t/3348543/>`_) => busybox/busybox-\*.bin
1312

1413
.. _Android Asset Packaging Tool: https://elinux.org/Android_aapt
1514
.. _BusyBox for Android: https://github.com/yashdsaraf/busybox

zip-content/misc/REUSE.toml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
version = 1
2+
3+
[[annotations]]
4+
path = [
5+
"busybox/busybox-*.bin",
6+
]
7+
SPDX-FileCopyrightText = "Copyright (C) tons of folks. <https://github.com/yashdsaraf/busybox/raw/master/AUTHORS>"
8+
SPDX-License-Identifier = "GPL-2.0-only"
9+
SPDX-FileType = "APPLICATION"
10+
SPDX-FileComment = [
11+
"Sources: https://github.com/yashdsaraf/busybox",
12+
"Binaries: https://github.com/yashdsaraf/bb-bot/releases"
13+
]
14+
15+
[[annotations]]
16+
path = [
17+
"aapt/aapt-*.bin",
18+
]
19+
SPDX-FileCopyrightText = "(c) 2005-2008 The Android Open Source Project"
20+
SPDX-License-Identifier = "Apache-2.0"
21+
SPDX-FileType = "APPLICATION"
22+
SPDX-FileComment = [
23+
"Sources: https://android.googlesource.com/platform/frameworks/base/+/refs/heads/master/tools/aapt/",
24+
"Binaries: https://github.com/substratum/substratum/tree/83f0847194c5d0adad714fbccd5573323c21be5b/app/src/main/assets"
25+
]

0 commit comments

Comments
 (0)