Sync with microG unofficial installer

Author: ale5000-git

.github/workflows/auto-nightly.yml

@@ -54,11 +54,11 @@ jobs:
           printf '%s\n' "::notice::SHA-256: ${ZIP_SHA256:-Missing}"
           printf '%s\n' "::notice::MD5: ${ZIP_MD5:-Missing}"
           : "${ZIP_FOLDER:?}" || exit "${?}"
-      - name: "Do we need to release?"
-        id: "release-decision"
+      - name: "Do we need to release the nightly?"
+        id: "nightly-logic"
         shell: bash
         run: |
-          # Do we need to release?
+          # Do we need to release the nightly?
           git fetch -q origin
           CREATE_RELEASE='false'
           IS_LATEST_COMMIT='false'
@@ -72,7 +72,7 @@ jobs:
           printf '%s\n' "${CREATE_RELEASE:?}"
       - name: "Delete previous nightly release"
         uses: actions/github-script@v7
-        if: "${{ steps.release-decision.outputs.CREATE_RELEASE == 'true' }}"
+        if: "${{ steps.nightly-logic.outputs.CREATE_RELEASE == 'true' }}"
         with:
           retries: 3
           script: |
@@ -108,7 +108,7 @@ jobs:
             });
       - name: "Create nightly release"
         uses: softprops/action-gh-release@v2
-        if: "${{ steps.release-decision.outputs.CREATE_RELEASE == 'true' }}"
+        if: "${{ steps.nightly-logic.outputs.CREATE_RELEASE == 'true' }}"
         with:
           name: "${{ steps.build.outputs.ZIP_VERSION }} nightly"
           tag_name: "nightly"

build.sh

@@ -242,7 +242,7 @@ if test "${OPENSOURCE_ONLY:?}" = 'false'; then
     cp -f -- "${MAIN_DIR:?}/cache/${LOCAL_PATH:?}/${LOCAL_FILENAME:?}.apk" "${TEMP_DIR:?}/zip-content/origin/${LOCAL_PATH:?}/" || ui_error "Failed to copy to the temp dir the file => '${LOCAL_PATH}/${LOCAL_FILENAME}.apk'"
 
     _extract_libs=''
-    if test "${LOCAL_FILENAME:?}" = 'PlayStore'; then _extract_libs='libs'; fi
+    if test "${LOCAL_FILENAME:?}" = 'PlayStore' || test "${LOCAL_FILENAME:?}" = 'PlayStoreARM64'; then _extract_libs='libs'; fi
 
     printf '%s\n' "${LOCAL_PATH:?}/${LOCAL_FILENAME:?}|${MIN_API:?}|${MAX_API?}|${FINAL_FILENAME:?}|${_extract_libs?}|${INTERNAL_NAME:?}|${FILE_HASH:?}" >> "${TEMP_DIR:?}/zip-content/origin/file-list.dat"
   done

includes/common.sh

@@ -32,13 +32,20 @@ readonly NL='
 
 pause_if_needed()
 {
-  # shellcheck disable=SC3028 # In POSIX sh, SHLVL is undefined
-  if test "${NO_PAUSE:-0}" = '0' && test "${CI:-false}" = 'false' && test "${TERM_PROGRAM-}" != 'vscode' && test "${SHLVL:-1}" = '1' && test -t 0 && test -t 1 && test -t 2; then
-    printf 1>&2 '\n\033[1;32m%s\033[0m' 'Press any key to exit...' || :
-    # shellcheck disable=SC3045
-    IFS='' read 1> /dev/null 2>&1 -r -s -n 1 _ || IFS='' read 1>&2 -r _ || :
+  # 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}"
 }
 
 beep()
@@ -51,7 +58,7 @@ beep()
 ui_error()
 {
   echo 1>&2 "ERROR: $1"
-  pause_if_needed
+  pause_if_needed 0
   restore_saved_title_if_exist
   test -n "${2-}" && exit "$2"
   exit 1

tools/bits-info.sh

@@ -1115,20 +1115,20 @@ clear_env()
 
 pause_if_needed()
 {
-  # shellcheck disable=SC3028 # Intended: In POSIX sh, SHLVL is undefined
+  # 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 # Intended: In POSIX sh, read -s / -n is undefined
-    IFS='' read 2> /dev/null 1>&2 -r -s -n 1 _ || IFS='' read 1>&2 -r _ || :
+    # 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}"
+  unset no_pause || :
+  return "${1:-0}"
 }
 
 main()
@@ -1538,4 +1538,4 @@ if test "${execute_script}" = 'true'; then
 fi
 
 clear_env
-pause_if_needed "${STATUS}"
+pause_if_needed "${STATUS?}"

tools/list-permissions.sh

@@ -0,0 +1,63 @@
+#!/usr/bin/env sh
+# SPDX-FileCopyrightText: (c) 2025 ale5000
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+# shellcheck enable=all
+# shellcheck disable=SC3043 # In POSIX sh, local is undefined
+
+export SCRIPT_NAME='List permissions used by apps'
+export SCRIPT_VERSION='0.0.3'
+
+# shellcheck disable=SC3040 # Ignore: In POSIX sh, set option pipefail is undefined
+case "$(set 2> /dev/null -o || set || :)" in *'pipefail'*) set -o pipefail || echo 1>&2 'Failed: pipefail' ;; *) ;; esac
+
+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}"
+}
+
+find_android_build_tool()
+{
+  local _tool_path
+
+  if test -n "${2-}" && _tool_path="${2:?}"; then
+    :
+  elif _tool_path="$(command -v "${1:?}")" && test -n "${_tool_path?}"; then
+    :
+  elif test -n "${ANDROID_SDK_ROOT-}" && test -d "${ANDROID_SDK_ROOT:?}/build-tools" && _tool_path="$(find "${ANDROID_SDK_ROOT:?}/build-tools" -maxdepth 2 -iname "${1:?}*" | LC_ALL=C sort -V -r | head -n 1)" && test -n "${_tool_path?}"; then
+    :
+  else
+    return 1
+  fi
+
+  printf '%s\n' "${_tool_path:?}"
+}
+
+main()
+{
+  AAPT2_PATH="$(find_android_build_tool 'aapt2' "${AAPT2_PATH-}")" || AAPT_PATH="$(find_android_build_tool 'aapt' "${AAPT_PATH-}")" || :
+
+  if test -n "${AAPT2_PATH-}"; then
+    "${AAPT2_PATH:?}" dump permissions "${@}" | grep -F -e 'uses-permission: ' | cut -d ':' -f '2-' -s | cut -b '2-' | LC_ALL=C sort || return "${?}"
+  elif test -n "${AAPT_PATH-}"; then
+    "${AAPT_PATH:?}" dump permissions "${@}" | grep -F -e 'uses-permission: ' | cut -d ':' -f '2-' -s | cut -b '2-' | LC_ALL=C sort || return "${?}"
+  else
+    return 255
+  fi
+}
+
+main "${@}"
+pause_if_needed "${?}"

zip-content/META-INF/com/google/android/update-binary.sh

@@ -5,7 +5,7 @@
 # shellcheck enable=all
 # shellcheck disable=SC3043 # In POSIX sh, local is undefined #
 
-echo 'PRELOADER'
+echo 'PRE-LOADER'
 
 ### INIT OPTIONS ###
 

zip-content/customize.sh

@@ -127,8 +127,6 @@ unset -f _log_path_setter || true
 readonly LOG_PATH
 export LOG_PATH
 
-export KEYCHECK_ENABLED='false'
-
 ### FUNCTIONS ###
 
 _send_text_to_recovery()
@@ -282,18 +280,6 @@ package_extract_file()
     }
 }
 
-package_extract_file_may_fail()
-{
-  {
-    unzip -o -p -qq "${ZIPFILE:?}" "${1:?}" 1> "${2:?}" && test -s "${2:?}"
-  } ||
-    {
-      rm -f -- "${2:?}" || true
-      ui_debug "Failed to extract the file '${1}' from this archive"
-      return 1
-    }
-}
-
 package_extract_file_safe()
 {
   "${OUR_BB}" unzip -opq "${ZIPFILE:?}" "${1:?}" 1> "${2:?}" || ui_error "Failed to extract the file '${1}' from this archive" 83
@@ -342,7 +328,7 @@ detect_recovery_arch()
 detect_recovery_arch
 
 OUR_BB="${BASE_TMP_PATH:?}/busybox"
-if test -n "${CUSTOM_BUSYBOX:-}" && test -e "${CUSTOM_BUSYBOX:?}"; then
+if test -n "${CUSTOM_BUSYBOX-}" && test -x "${CUSTOM_BUSYBOX:?}"; then
   OUR_BB="${CUSTOM_BUSYBOX:?}"
   ui_debug "Using custom BusyBox... '${OUR_BB:?}'"
 elif test "${RECOVERY_ARCH}" = 'x86_64'; then
@@ -354,16 +340,14 @@ elif test "${RECOVERY_ARCH}" = 'x86'; then
 elif test "${RECOVERY_ARCH}" = 'arm64-v8a'; then
   ui_debug 'Extracting 64-bit ARM BusyBox...'
   package_extract_file 'misc/busybox/busybox-arm64.bin' "${OUR_BB:?}"
-  package_extract_file_may_fail 'misc/keycheck/keycheck-arm.bin' "${BASE_TMP_PATH:?}/keycheck"
 elif test "${RECOVERY_ARCH}" = 'armeabi-v7a' || test "${RECOVERY_ARCH}" = 'armeabi'; then
   ui_debug 'Extracting ARM BusyBox...'
   package_extract_file 'misc/busybox/busybox-arm.bin' "${OUR_BB:?}"
-  package_extract_file_may_fail 'misc/keycheck/keycheck-arm.bin' "${BASE_TMP_PATH:?}/keycheck"
 fi
-if ! test -e "${OUR_BB:?}"; then ui_error 'BusyBox not found'; fi
+if test ! -e "${OUR_BB:?}"; then ui_error 'BusyBox not found'; fi
 
 # Give execution rights (if needed)
-if test -z "${CUSTOM_BUSYBOX:-}" || test "${OUR_BB:?}" != "${CUSTOM_BUSYBOX:?}"; then
+if test -z "${CUSTOM_BUSYBOX-}" || test "${OUR_BB:?}" != "${CUSTOM_BUSYBOX:?}"; then
   # Legacy versions of chmod don't support +x and --
   chmod 0755 "${OUR_BB:?}" || ui_error "chmod failed on '${OUR_BB:?}'" # Needed to make working the "safe" functions
 fi
@@ -423,25 +407,10 @@ DEBUG_LOG="$(_get_common_setting 'DEBUG_LOG' "${DEBUG_LOG:-0}")"
 test "${DEBUG_LOG:?}" -ne 0 && enable_debug_log # Enable file logging if needed
 
 LIVE_SETUP_ALLOWED="${LIVE_SETUP_ALLOWED:-true}"
-KEYCHECK_PATH=''
-if test "${TEST_INSTALL:-false}" != 'false'; then
-  "${OUR_BB:?}" rm -f "${BASE_TMP_PATH:?}/keycheck" || ui_error "Failed to remove keycheck"
-else
-  # Setup Keycheck in the temp folder
-  if test -e "${BASE_TMP_PATH:?}/keycheck"; then
-    KEYCHECK_PATH="${TMP_PATH:?}/bin/keycheck"
-    "${OUR_BB:?}" mv -f "${BASE_TMP_PATH:?}/keycheck" "${KEYCHECK_PATH:?}" || ui_error "Failed to move keycheck to the bin folder"
-    # Give execution rights
-    "${OUR_BB:?}" chmod 0755 "${KEYCHECK_PATH:?}" || ui_error "chmod failed on keycheck"
-    export KEYCHECK_ENABLED='true'
-  fi
-fi
-
-# Live setup under continuous integration systems doesn't make sense
-if test "${CI:-false}" != 'false'; then LIVE_SETUP_ALLOWED='false'; fi
+if test "${CI:-false}" != 'false'; then LIVE_SETUP_ALLOWED='false'; fi # Live setup under continuous integration systems doesn't make sense
 
-readonly LIVE_SETUP_ALLOWED KEYCHECK_PATH
-export LIVE_SETUP_ALLOWED KEYCHECK_PATH
+readonly LIVE_SETUP_ALLOWED
+export LIVE_SETUP_ALLOWED
 
 # Extract scripts
 ui_debug 'Extracting scripts...'