chore: sync with microG unofficial installer

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

Author: ale5000-git

build.sh

@@ -278,7 +278,7 @@ if test "${OPENSOURCE_ONLY:?}" = 'false'; then
     cp -f -- "${BUILD_CACHE_DIR:?}/${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' || test "${LOCAL_FILENAME:?}" = 'PlayStoreARM64'; then _extract_libs='libs'; fi
+    if test "${LOCAL_FILENAME:?}" = 'PlayStore'; 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

config-git.sh

@@ -56,19 +56,27 @@ import_gpg_keys()
   fi
 }
 
-STATUS=0
+setup_gpg()
+{
+  command 1> /dev/null -v 'gpg' || {
+    printf '%s\n' 'WARNING: gpg is missing'
+    return 255
+  }
+
+  # GitHub => https://github.com/web-flow.gpg
+  test -f "${PWD:?}/.public-keys/github.gpg"
+  import_gpg_keys 'GitHub' "${PWD:?}/.public-keys/github.gpg" "${?}" || return "${?}"
+  printf '%s\n' '968479A1AFF927E37D1A566BB5690EEEBB952194:6:' | HOME="${USER_HOME:-${HOME:?}}" gpg --import-ownertrust || return "${?}"
+}
 
-# GitHub => https://github.com/web-flow.gpg
+STATUS=0
 
 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
+setup_gpg || STATUS="${?}"
 
 test -d "${PWD:?}/.git-hooks"
 config_var core.hooksPath '.git-hooks' "${?}" || STATUS="${?}"

zip-content/inc/common-functions.sh

@@ -1031,6 +1031,15 @@ _generate_architectures_list()
   export ARCH_LIST
 }
 
+is_new_architecture()
+{
+  case "${1:?}" in
+    'arm64-v8a' | 'armeabi-v7a' | 'x86_64' | 'x86') return 0 ;;
+    *) ;;
+  esac
+  return 1
+}
+
 display_basic_info()
 {
   ui_msg "$(write_separator_line "${#MODULE_NAME}" '-' || :)"
@@ -3538,7 +3547,7 @@ kill_app()
   test "${DRY_RUN:?}" -eq 0 || return
 
   if test "${BOOTMODE:?}" = 'true' && test -n "${DEVICE_AM?}"; then
-    PATH="${PREVIOUS_PATH?}" "${DEVICE_AM:?}" force-stop "${1:?}" || PATH="${PREVIOUS_PATH?}" "${DEVICE_AM:?}" kill "${1:?}" || :
+    PATH="${PREVIOUS_PATH?}" "${DEVICE_AM:?}" 2> /dev/null force-stop "${1:?}" || PATH="${PREVIOUS_PATH?}" "${DEVICE_AM:?}" kill "${1:?}" || :
   fi
 }
 

zip-content/module.prop

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