Skip to content

Commit 0dc0564

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

File tree

12 files changed

+347
-116
lines changed

12 files changed

+347
-116
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ docs/CODEOWNERS text eol=lf
1515
.mailmap text eol=lf
1616
.semgrepignore text eol=lf
1717
.shellcheckrc text eol=lf
18+
.tool-versions text eol=lf
1819

1920
*.gpg text eol=lf
2021
*.yml text eol=lf

.github/workflows/auto-nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
uses: actions/setup-java@v5
4646
with:
4747
distribution: "temurin"
48-
java-version: "17"
48+
java-version-file: ".tool-versions"
4949
- name: "Use cache"
5050
uses: actions/cache@v4
5151
timeout-minutes: 10

.github/workflows/auto-release-from-tag.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
uses: actions/setup-java@v5
3636
with:
3737
distribution: "temurin"
38-
java-version: "17"
38+
java-version-file: ".tool-versions"
3939
- name: "Build the flashable OTA zip"
4040
id: "build"
4141
shell: bash

.github/workflows/code-scan.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,17 @@ jobs:
2828
steps:
2929
- name: "Verify tokens"
3030
id: check-tokens
31+
shell: bash
32+
env:
33+
CODACY_TOKEN: "${{ secrets.CODACY_PROJECT_TOKEN }}"
34+
SONAR_TOKEN: "${{ secrets.SONAR_TOKEN }}"
3135
run: |
3236
# Verifying tokens...
3337
# Codacy
34-
if test -n '${{ secrets.CODACY_PROJECT_TOKEN }}'; then token_set='true'; else token_set='false'; fi
38+
if test -n "${CODACY_TOKEN?}"; then token_set='true'; else token_set='false'; fi
3539
printf 'CODACY_TOKEN_SET=%s\n' "${token_set:?}" 1>> "${GITHUB_OUTPUT?}"
3640
# SonarQube
37-
if test -n '${{ secrets.SONAR_TOKEN }}'; then token_set='true'; else token_set='false'; fi
41+
if test -n "${SONAR_TOKEN?}"; then token_set='true'; else token_set='false'; fi
3842
printf 'SONAR_TOKEN_SET=%s\n' "${token_set:?}" 1>> "${GITHUB_OUTPUT?}"
3943
- name: "Verify the dependency graph"
4044
id: dependency-graph
@@ -76,7 +80,7 @@ jobs:
7680
uses: actions/setup-java@v5
7781
with:
7882
distribution: "temurin"
79-
java-version: "17"
83+
java-version-file: ".tool-versions"
8084
- name: "Generate and submit dependency graph"
8185
uses: gradle/actions/dependency-submission@v4
8286
with:

.github/workflows/coverage.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
uses: actions/setup-java@v5
3333
with:
3434
distribution: "temurin"
35-
java-version: "17"
35+
java-version-file: ".tool-versions"
3636
- name: "Setup Ruby"
3737
uses: ruby/setup-ruby@v1
3838
timeout-minutes: 10
@@ -81,10 +81,11 @@ jobs:
8181
- name: "Verify Codecov token"
8282
id: "codecov-token"
8383
shell: bash
84+
env:
85+
CODECOV_TOKEN: "${{ secrets.CODECOV_TOKEN }}"
8486
run: |
8587
# Verifying token...
86-
token_set='true'
87-
test -n '${{ secrets.CODECOV_TOKEN }}' || token_set='false'
88+
if test -n "${CODECOV_TOKEN?}"; then token_set='true'; else token_set='false'; fi
8889
printf 'TOKEN_SET=%s\n' "${token_set:?}" 1>> "${GITHUB_OUTPUT?}"
8990
- name: "Upload coverage reports to Codecov"
9091
if: "${{ steps.codecov-token.outputs.TOKEN_SET == 'true' && github.event_name == 'push' && github.ref == 'refs/heads/main' }}"
@@ -96,10 +97,11 @@ jobs:
9697
- name: "Verify Codacy token"
9798
id: "codacy-token"
9899
shell: bash
100+
env:
101+
CODACY_TOKEN: "${{ secrets.CODACY_PROJECT_TOKEN }}"
99102
run: |
100103
# Verifying token...
101-
token_set='true'
102-
test -n '${{ secrets.CODACY_PROJECT_TOKEN }}' || token_set='false'
104+
if test -n "${CODACY_TOKEN?}"; then token_set='true'; else token_set='false'; fi
103105
printf 'TOKEN_SET=%s\n' "${token_set:?}" 1>> "${GITHUB_OUTPUT?}"
104106
- name: "Upload coverage reports to Codacy"
105107
if: "${{ steps.codacy-token.outputs.TOKEN_SET == 'true' && github.event_name == 'push' && github.ref == 'refs/heads/main' }}"

.tool-versions

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# SPDX-FileCopyrightText: NONE
2+
# SPDX-License-Identifier: CC0-1.0
3+
java temurin-17

recovery-simulator/recovery.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -360,9 +360,9 @@ _android_ext_stor="${_base_simulation_path:?}/sdcard0"
360360
_android_sec_stor="${_base_simulation_path:?}/sdcard1"
361361
if test -n "${CYGPATH?}"; then
362362
# Only on Bash under Windows
363-
_android_lib_path="$("${CYGPATH:?}" -p -u ".;${_base_simulation_path:?}/sbin")" || fail_with_msg 'Unable to convert the Android lib path env'
363+
_android_lib_path="$("${CYGPATH:?}" -p -u "${_base_simulation_path:?}/sbin")" || fail_with_msg 'Unable to convert the Android lib path env'
364364
else
365-
_android_lib_path=".${PATHSEP:?}${_base_simulation_path:?}/sbin"
365+
_android_lib_path="${_base_simulation_path:?}/sbin"
366366
fi
367367
_android_data="${_base_simulation_path:?}/data"
368368
_android_sys="${_base_simulation_path:?}/system"
@@ -383,11 +383,13 @@ mkdir -p "${_base_simulation_path:?}"
383383
cd "${_base_simulation_path:?}" || fail_with_msg 'Failed to change dir to the base simulation path'
384384
mkdir -p "${_android_tmp:?}"
385385
mkdir -p "${_android_sys:?}"
386-
mkdir -p "${_android_sys:?}/addon.d"
386+
mkdir -p "${_android_sys:?}/lib64"
387+
mkdir -p "${_android_sys:?}/lib"
387388
mkdir -p "${_android_sys:?}/etc"
388389
mkdir -p "${_android_sys:?}/priv-app"
389390
mkdir -p "${_android_sys:?}/app"
390391
mkdir -p "${_android_sys:?}/bin"
392+
mkdir -p "${_android_sys:?}/addon.d"
391393
mkdir -p "${_android_data:?}"
392394
mkdir -p "${_android_ext_stor:?}"
393395
mkdir -p "${_android_sec_stor:?}"

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-5832-g3b6f6f703 (2025-09-11)** => win/busybox.exe
12+
- `BusyBox for Windows`_ **1.38.0-PRE-5833-g7299e1a11 (2025-09-16)** => 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/generate-perm-xml.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -420,10 +420,12 @@ main()
420420
{
421421
local status backup_ifs base_name cmd_output pkg_name perm_list cert_sha256
422422

423-
DATA_DIR="$(find_data_dir)" && test -d "${DATA_DIR:?}/perms" || {
423+
if DATA_DIR="$(find_data_dir)" && test -d "${DATA_DIR:?}/perms"; then
424+
:
425+
else
424426
show_error 'You must execute dl-perm-list.sh before using this script'
425427
return 4
426-
}
428+
fi
427429

428430
test -n "${1-}" || {
429431
show_error 'You must pass the filename of the file to be processed'

tools/win/busybox.exe

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)