chore: sync with microG unofficial installer

ale5000-git · ale5000-git · commit a2a6821ab653 · 2025-09-06T20:07:20.000+02:00
diff --git a/.git-hooks/commit-msg b/.git-hooks/commit-msg
@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+# SPDX-FileCopyrightText: NONE
+# SPDX-License-Identifier: CC0-1.0
+
+# An hook script to check the commit log message.
+# Called by "git commit" with one argument, the name of the file
+# that has the commit message.  The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit.  The hook is allowed to edit the commit message file.
+
+grep -m 1 -e '^Signed-off-by: ' -- "${1}" || {
+  echo 1>&2 "Missing Signed-off-by line."
+  exit 46
+}
diff --git a/.gitattributes b/.gitattributes
@@ -3,17 +3,23 @@
 
 * text=auto
 
-docs/CODEOWNERS   text eol=lf
+.git-hooks/*      text eol=lf
 .gitattributes    text eol=lf
 .gitignore        text eol=lf
 .gitmodules       text eol=lf
+allowed_signers   text eol=lf
 
+docs/CODEOWNERS   text eol=lf
 .editorconfig     text eol=lf
 .mailmap          text eol=lf
 .semgrepignore    text eol=lf
 .shellcheckrc     text eol=lf
+
+# Ruby
 .simplecov        text eol=lf
+Gemfile*          text eol=lf
 
+*.gpg             text eol=lf
 *.yml             text eol=lf
 *.xml             text eol=lf
 *.json            text eol=lf
diff --git a/.github/workflows/generate-perm-xml.yml b/.github/workflows/generate-perm-xml.yml
@@ -38,7 +38,7 @@ jobs:
           if test ! -d './cache/tools/perms' || '${{ steps.cache-step.outputs.cache-hit != 'true' }}'; then
             './tools/dl-perm-list.sh' || exit "${?}"
           fi
-          find './zip-content' -name '*.apk' | sort | './tools/generate-perm-xml.sh' --use-placeholders - || exit "${?}"
+          find './zip-content' -name '*.apk' | './tools/generate-perm-xml.sh' --use-placeholders - || exit "${?}"
       - name: "Upload artifacts"
         uses: actions/upload-artifact@v4
         with:
diff --git a/.gitignore b/.gitignore
@@ -1,27 +1,27 @@
 # SPDX-FileCopyrightText: NONE
 # SPDX-License-Identifier: CC0-1.0
 
-# Always ignore
+# Files to ignore in all cases
+/.bundle/
+/.cache/
+/.git/
 /.gnupg/
+/.licenses/
 /.ssh/
 /coverage/
 /dependency-graph-reports/
 /.ash_history
 /.bash_history
 /.lesshst
 /.wget-hsts
+__pycache__/
+.DS_Store
+Thumbs.db
 desktop.ini
 *.dex
 *.log
 *.sarif
 
-# Caches
-/.cache/
-/.git/
-__pycache__/
-.DS_Store
-Thumbs.db
-
 # VS Code files
 /.vscode/launch.json
 
diff --git a/.public-keys/github.gpg b/.public-keys/github.gpg
@@ -0,0 +1,41 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=uMz0
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/.simplecov b/.simplecov
@@ -3,7 +3,6 @@
 # SPDX-FileCopyrightText: NONE
 # SPDX-License-Identifier: CC0-1.0
 
-require 'simplecov'
 require 'simplecov-lcov'
 
 SimpleCov.configure do
diff --git a/Gemfile b/Gemfile
@@ -0,0 +1,10 @@
+# -*- coding: utf-8; mode: ruby; frozen_string_literal: true -*-
+# SPDX-FileCopyrightText: NONE
+# SPDX-License-Identifier: CC0-1.0
+
+source 'https://rubygems.org'
+
+ruby ">=3.0"
+
+gem 'bashcov', '>=3.2'
+gem 'simplecov-lcov'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -0,0 +1,23 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    bashcov (3.2.0)
+      simplecov (~> 0.21)
+    docile (1.4.1)
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.13.2)
+    simplecov-lcov (0.9.0)
+    simplecov_json_formatter (0.1.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bashcov (>= 3.2)
+  simplecov-lcov
+
+BUNDLED WITH
+   2.5.23
diff --git a/REUSE.toml b/REUSE.toml
@@ -0,0 +1,11 @@
+version = 1
+
+[[annotations]]
+path = [
+    ".public-keys/*.gpg",
+    "fastlane/metadata/android/en-US/*.txt",
+    "allowed_signers",
+    "Gemfile.lock"
+]
+SPDX-FileCopyrightText = "NONE"
+SPDX-License-Identifier = "CC0-1.0"
diff --git a/allowed_signers b/allowed_signers
@@ -0,0 +1,2 @@
+15793015+ale5000-git@users.noreply.github.com namespaces="git",valid-after="20250825Z" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBCshlgMBJ9Xo9sjYAJ7Bu9ScHuv6PjfKQlKASmQsHyc
+15793015+ale5000-git@users.noreply.github.com namespaces="git",valid-after="20180802Z",valid-before="20250826Z" ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAgubqZ9RkrK/biXtuFHS9fPaWy/LZPqOpucy/WYLtDz9Br/0ri8H3MetKt92leBMkqWtuecies1Yr4gRRY/FX6DpdBYyogcYfNQFGsL4vonAjzYT3Lx0GUfIvuxldd9N5Q2xa/THVtQDRZdRTJVRRDj14ERu+N8Mh1QjZwY2jZ8STmXMoxWo6HK/UgpFTbD+NsGy/aNQBhy6cPRE9yPzcUyeDNmrWRt3YyzOQuQ8w5DM+CMxgceeu4wiDGeKmxRPG7RWxnQKF4J8kpdG44g91kvAMgs6vdAVnksY4moXUjz43+gQGlCpEdSjuK0NUhD83yN4fk9QzomUyUOTQySpanw==
diff --git a/config-git.sh b/config-git.sh
@@ -0,0 +1,82 @@
+#!/usr/bin/env sh
+# SPDX-FileCopyrightText: NONE
+# SPDX-License-Identifier: CC0-1.0
+
+pause_if_needed()
+{
+  # shellcheck disable=SC3028 # Ignore: In POSIX sh, SHLVL is undefined
+  if test "${NO_PAUSE:-0}" = '0' && test "${no_pause:-0}" = '0' && test "${CI:-false}" = 'false' && test "${TERM_PROGRAM:-unknown}" != 'vscode' && test "${SHLVL:-1}" = '1' && test -t 0 && test -t 1 && test -t 2; then
+    if test -n "${NO_COLOR-}"; then
+      printf 1>&2 '\n%s' 'Press any key to exit... ' || :
+    else
+      printf 1>&2 '\n\033[1;32m\r%s' 'Press any key to exit... ' || :
+    fi
+    # shellcheck disable=SC3045 # Ignore: In POSIX sh, read -s / -n is undefined
+    IFS='' read 2> /dev/null 1>&2 -r -s -n1 _ || IFS='' read 1>&2 -r _ || :
+    printf 1>&2 '\n' || :
+    test -n "${NO_COLOR-}" || printf 1>&2 '\033[0m\r    \r' || :
+  fi
+  unset no_pause || :
+  return "${1:-0}"
+}
+
+config_var()
+{
+  printf '%s' "Configuring ${1:?}: "
+
+  if test -n "${3-}" && test "${3:?}" != 0; then
+    printf '%s\n' 'Missing'
+    return 44
+  fi
+
+  if HOME="${USER_HOME:-${HOME:?}}" git config set --local "${1:?}" "${2:?}"; then
+    printf '%s\n' 'OK'
+  else
+    _status="${?}"
+    printf '%s\n' 'Error'
+    return "${_status:?}"
+  fi
+}
+
+import_gpg_keys()
+{
+  printf '%s' "Importing ${1:?} public keys: "
+
+  if test -n "${3-}" && test "${3:?}" != 0; then
+    printf '%s\n' 'Missing'
+    return 44
+  fi
+
+  if HOME="${USER_HOME:-${HOME:?}}" gpg 2> /dev/null --import -- "${2:?}"; then
+    printf '%s\n' 'OK'
+  else
+    _status="${?}"
+    printf '%s\n' 'Error'
+    return "${_status:?}"
+  fi
+}
+
+STATUS=0
+
+# GitHub => https://github.com/web-flow.gpg
+
+printf '%s\n' "Repo dir: ${PWD?}" || STATUS="${?}"
+
+test -f "${PWD:?}/allowed_signers"
+config_var gpg.ssh.allowedSignersFile 'allowed_signers' "${?}" || STATUS="${?}"
+
+test -f "${PWD:?}/.public-keys/github.gpg"
+import_gpg_keys 'GitHub' "${PWD:?}/.public-keys/github.gpg" "${?}" || STATUS="${?}"
+
+printf '%s\n' '968479A1AFF927E37D1A566BB5690EEEBB952194:6:' | HOME="${USER_HOME:-${HOME:?}}" gpg --import-ownertrust || STATUS="${?}" # GitHub
+
+test -d "${PWD:?}/.git-hooks"
+config_var core.hooksPath '.git-hooks' "${?}" || STATUS="${?}"
+
+config_var format.signOff "true" || STATUS="${?}"
+config_var alias.cm 'commit -s' || STATUS="${?}"
+
+test "${STATUS:?}" = 0 || printf '%s\n' "Error code: ${STATUS:?}"
+
+pause_if_needed "${STATUS:?}"
+exit "${?}"
diff --git a/fastlane/metadata/android/en-US/full_description.txt.license b/fastlane/metadata/android/en-US/full_description.txt.license
diff --git a/fastlane/metadata/android/en-US/short_description.txt.license b/fastlane/metadata/android/en-US/short_description.txt.license
diff --git a/fastlane/metadata/android/en-US/title.txt.license b/fastlane/metadata/android/en-US/title.txt.license
diff --git a/includes/common.sh b/includes/common.sh
@@ -1333,6 +1333,8 @@ init_cmdline()
   readonly UTILS_DATA_DIR="${UTILS_DIR:?}/data"
   export UTILS_DIR UTILS_DATA_DIR
 
+  if test -n "${GIT_SSH:="$(command -v 'TortoiseGitPlink' || :)"}"; then export GIT_SSH; else unset GIT_SSH; fi
+
   # Set the path of Android SDK if not already set
   if test -z "${ANDROID_SDK_ROOT-}"; then
     if test -n "${USER_HOME-}" && test -e "${USER_HOME:?}/Android/Sdk"; then
@@ -1447,6 +1449,21 @@ init_cmdline()
     readonly __DEFAULT_PS1_AS_ROOT=''
   fi
 
+  git()
+  {
+    HOME="${USER_HOME:-${HOME:?}}" command -- git "${@}"
+  }
+
+  gpg()
+  {
+    HOME="${USER_HOME:-${HOME:?}}" command -- gpg "${@}"
+  }
+
+  bundle()
+  {
+    HOME="${USER_HOME:-${HOME:?}}" command -- bundle "${@}"
+  }
+
   if test "${CI:-false}" = 'false'; then
     PS1="${__DEFAULT_PS1:?}"
     PROMPT_COMMAND='__update_title_and_ps1 "${@}" || true'
@@ -1494,7 +1511,7 @@ export PATH
 if test -n "${ANDROID_SDK_ROOT:-}" && test -e "${ANDROID_SDK_ROOT:?}/emulator/emulator.exe"; then
   # shellcheck disable=SC2139
   {
-    alias 'emu'="'${ANDROID_SDK_ROOT:?}/emulator/emulator.exe'"
-    alias 'emu-w'="'${ANDROID_SDK_ROOT:?}/emulator/emulator.exe' -writable-system"
+    alias 'emu'="'${ANDROID_SDK_ROOT:?}/emulator/emulator.exe' -no-boot-anim"
+    alias 'emu-w'="'${ANDROID_SDK_ROOT:?}/emulator/emulator.exe' -writable-system -no-snapshot-load -no-boot-anim"
   }
 fi
diff --git a/tools/generate-perm-xml.sh b/tools/generate-perm-xml.sh
@@ -12,7 +12,7 @@
 
 readonly SCRIPT_NAME='XML permissions generator'
 readonly SCRIPT_SHORTNAME='GenPermXml'
-readonly SCRIPT_VERSION='0.3.2'
+readonly SCRIPT_VERSION='0.3.4'
 readonly SCRIPT_AUTHOR='ale5000'
 
 set -u
@@ -436,7 +436,7 @@ main()
 
     set -f || :
     # shellcheck disable=SC2046 # Word splitting is intended
-    set -- $(cat || :) || ui_error 'Failed expanding stdin inside main()'
+    set -- $(cat | sort || :) || ui_error 'Failed expanding stdin inside main()'
     set +f || :
 
     IFS="${backup_ifs?}"
@@ -478,14 +478,21 @@ main()
     return 255
   fi
 
+  printf 1>&2 '%s\n' "Output dir: ${BASE_DIR:?}/output"
+
   status=0
   while test "${#}" -gt 0; do
     base_name="$(basename "${1:?}" || printf '%s\n' 'unknown')"
-    printf 1>&2 '\n%s\n' "${base_name?}"
+    printf 1>&2 '\n%s\n' "Filename: ${base_name:?}"
 
     show_status 'Using aapt...'
     set_red_color
-    cmd_output="$("${AAPT_PATH:?}" dump permissions "${1:?}" | grep -F -e 'package: ' -e 'uses-permission: ')" || return 9
+    cmd_output="$("${AAPT_PATH:?}" dump permissions "${1:?}" | grep -F -e 'package: ' -e 'uses-permission: ')" || {
+      status=9
+      show_error "aapt failed"
+      shift || return 254
+      continue
+    }
 
     pkg_name="$(printf '%s\n' "${cmd_output:?}" | grep -F -e 'package: ' | cut -d ':' -f '2-' -s | cut -b '2-')" || return 10
     perm_list="$(printf '%s\n' "${cmd_output:?}" | grep -F -e 'uses-permission: ' | cut -d "'" -f '2' -s | LC_ALL=C sort)" || return 11

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+15793015+ale5000-git@users.noreply.github.com namespaces="git",valid-after="20250825Z" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBCshlgMBJ9Xo9sjYAJ7Bu9ScHuv6PjfKQlKASmQsHyc`
	`2`	`+15793015+ale5000-git@users.noreply.github.com namespaces="git",valid-after="20180802Z",valid-before="20250826Z" ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAgubqZ9RkrK/biXtuFHS9fPaWy/LZPqOpucy/WYLtDz9Br/0ri8H3MetKt92leBMkqWtuecies1Yr4gRRY/FX6DpdBYyogcYfNQFGsL4vonAjzYT3Lx0GUfIvuxldd9N5Q2xa/THVtQDRZdRTJVRRDj14ERu+N8Mh1QjZwY2jZ8STmXMoxWo6HK/UgpFTbD+NsGy/aNQBhy6cPRE9yPzcUyeDNmrWRt3YyzOQuQ8w5DM+CMxgceeu4wiDGeKmxRPG7RWxnQKF4J8kpdG44g91kvAMgs6vdAVnksY4moXUjz43+gQGlCpEdSjuK0NUhD83yN4fk9QzomUyUOTQySpanw==`