chore: sync with microG unofficial installer

Signed-off-by: ale5000 <15793015+ale5000-git@users.noreply.github.com>

Author: ale5000-git

.gitignore

@@ -26,6 +26,12 @@ desktop.ini
 # VS Code files
 /.vscode/launch.json
 
+# Git hooks
+/.git-hooks/post-checkout
+/.git-hooks/post-commit
+/.git-hooks/post-merge
+/.git-hooks/pre-push
+
 # Gradle files
 /.gradle/
 /build/

.vscode/tasks.json

@@ -43,7 +43,7 @@
             "problemMatcher": []
         },
         {
-            "label": "test",
+            "label": "installTest",
             "detail": "Emulate an Android recovery on your PC and run the flashable zip file inside it to see the result.",
             "type": "shell",
             "command": "${workspaceFolder}/recovery-simulator/recovery.sh",

config-git.sh

@@ -71,19 +71,24 @@ setup_gpg()
 
 STATUS=0
 
-printf '%s\n' "Repo dir: ${PWD?}" || STATUS="${?}"
-
-test -d "${PWD:?}/.git-hooks"
-config_var core.hooksPath '.git-hooks' "${?}" || STATUS="${?}"
+printf '%s\n\n' "Repo dir: ${PWD?}" || STATUS="${?}"
 
 test -f "${PWD:?}/allowed_signers"
 config_var gpg.ssh.allowedSignersFile 'allowed_signers' "${?}" || STATUS="${?}"
 
-setup_gpg || STATUS="${?}"
-
 config_var format.signOff 'true' || STATUS="${?}"
 config_var alias.cm 'commit -s' || STATUS="${?}"
 
+printf '\n'
+
+test -d "${PWD:?}/.git-hooks"
+config_var core.hooksPath '.git-hooks' "${?}" || STATUS="${?}"
+HOME="${USER_HOME:-${HOME:?}}" git lfs install --local || STATUS="${?}"
+
+printf '\n'
+
+setup_gpg || STATUS="${?}"
+
 test "${STATUS:?}" = 0 || printf '%s\n' "Error code: ${STATUS:?}"
 
 pause_if_needed "${STATUS:?}"

tools/dl-perm-list.sh

@@ -12,7 +12,7 @@
 
 readonly SCRIPT_NAME='Android permissions retriever'
 readonly SCRIPT_SHORTNAME='DlPermList'
-readonly SCRIPT_VERSION='0.3.0'
+readonly SCRIPT_VERSION='0.3.1'
 readonly SCRIPT_AUTHOR='ale5000'
 
 set -u
@@ -41,7 +41,7 @@ readonly MAX_API='36'
   readonly TAG_API_33='android-13.0.0_r84' # Android 13
   readonly TAG_API_34='android-14.0.0_r75' # Android 14
   readonly TAG_API_35='android-15.0.0_r36' # Android 15
-  readonly TAG_API_36='android-16.0.0_r2'  # Android 16
+  readonly TAG_API_36='android-16.0.0_r4'  # Android 16
 }
 
 readonly WGET_CMD='wget'

zip-content/customize.sh

@@ -16,8 +16,28 @@ set -u 2> /dev/null || :
   (set -o pipefail 1> /dev/null 2>&1) && set -o pipefail || :
 }
 
+### MAGISK / KERNELSU VARIABLES ###
+
+SKIPUNZIP=1
+ASH_STANDALONE=1
+KSU="${KSU:-false}"
+readonly SKIPUNZIP ASH_STANDALONE KSU
+export SKIPUNZIP ASH_STANDALONE KSU
+
+if test "${KSU:?}" != 'false'; then
+  INSTALL_MODE='KernelSU'
+elif test -n "${MAGISK_VER_CODE-}"; then
+  INSTALL_MODE='Magisk'
+else
+  INSTALL_MODE='Pure'
+fi
+readonly INSTALL_MODE
+export INSTALL_MODE
+
 ### PREVENTIVE CHECKS ###
 
+export OUTFD="${OUTFD:-2}"
+
 if test -z "${BOOTMODE-}"; then
   printf 1>&2 '%s\n' 'Missing BOOTMODE variable'
   abort 2> /dev/null 'Missing BOOTMODE variable'
@@ -33,9 +53,9 @@ if test -z "${TMPDIR-}" || test ! -w "${TMPDIR:?}"; then
   abort 2> /dev/null 'The temp folder is missing (2)'
   exit 1
 fi
-if test -z "${OUTFD-}" || test "${OUTFD:?}" -lt 1; then
-  printf 1>&2 '%s\n' 'Missing or invalid OUTFD variable'
-  abort 2> /dev/null  'Missing or invalid OUTFD variable'
+if test "${OUTFD:?}" -lt 1; then
+  printf 1>&2 '%s\n' 'Invalid OUTFD variable'
+  abort 2> /dev/null  'Invalid OUTFD variable'
   exit 1
 fi
 RECOVERY_PIPE="/proc/self/fd/${OUTFD:?}"
@@ -44,19 +64,11 @@ test -e "${RECOVERY_PIPE:?}" || RECOVERY_PIPE=''
 export BOOTMODE
 export ZIPFILE
 export TMPDIR
-export OUTFD
 export RECOVERY_PIPE
 export ANDROID_ROOT
 export ANDROID_DATA
 unset REPLACE
 
-### MAGISK VARIABLES ###
-
-SKIPUNZIP=1
-ASH_STANDALONE=1
-readonly SKIPUNZIP ASH_STANDALONE
-export SKIPUNZIP ASH_STANDALONE
-
 ### GLOBAL VARIABLES ###
 
 export DEBUG_LOG_ENABLED=0
@@ -397,11 +409,15 @@ detect_recovery_arch()
     armv6* | armv5*)                    RECOVERY_ARCH='armeabi' ;;
     #mips64)                             RECOVERY_ARCH='mips64' ;;
     #mips)                               RECOVERY_ARCH='mips' ;;
-    *) ui_error "Unsupported architecture: $(uname -m || true)" ;;
+    *) ui_error "Unsupported architecture: $(uname -m || :)" ;;
   esac
 }
 detect_recovery_arch
 
+if test "${INSTALL_MODE:?}" != 'Pure'; then
+  ui_error "This ZIP currently cannot be installed as ${INSTALL_MODE?} module"
+fi
+
 OUR_BB="${BASE_TMP_PATH:?}/busybox"
 if test -n "${CUSTOM_BUSYBOX-}" && test -x "${CUSTOM_BUSYBOX:?}"; then
   OUR_BB="${CUSTOM_BUSYBOX:?}"

zip-content/inc/common-functions.sh

@@ -1301,7 +1301,7 @@ _generate_architectures_list()
   export ARCH_LIST
 }
 
-is_new_architecture()
+is_architecture_still_supported_by_Android()
 {
   case "${1:?}" in
     'arm64-v8a' | 'armeabi-v7a' | 'x86_64' | 'x86') return 0 ;;
@@ -1731,7 +1731,7 @@ initialize()
   if mount_partition_if_possible 'data' "userdata${NL:?}DATAFS${NL:?}" "$(generate_mountpoint_list 'data' "${_additional_data_mountpoint?}" || :)"; then
     DATA_PATH="${LAST_MOUNTPOINT:?}"
     UNMOUNT_DATA="${LAST_PARTITION_MUST_BE_UNMOUNTED:?}"
-    remount_read_write_if_possible "${LAST_MOUNTPOINT:?}"
+    remount_read_write_if_possible "${LAST_MOUNTPOINT:?}" false || ui_warning "The data partition cannot be remounted as read-write; I suggest to manually performing a factory reset after flashing this ZIP."
   else
     ui_warning "The data partition cannot be mounted; I suggest to manually performing a factory reset after flashing this ZIP."
   fi

zip-content/module.prop

@@ -5,7 +5,7 @@
 id=google-sync-addon
 numericId=928871
 name=Google sync add-on
-version=v1.3.2.39-alpha
+version=v1.3.2.41-alpha
 versionCode=6
 author=ale5000
 description=It installs Google sync adapters on Android.