Sync with microG unofficial installer

Author: ale5000-git

build.sh

@@ -255,7 +255,7 @@ fi
 
 printf '%s\n' 'Setting name;Visibility;Type' 1> "${TEMP_DIR:?}/zip-content/setprop-settings-list.csv" || ui_error 'Failed to generate setprop settings list (1)'
 printf '%s\n' 'DRY_RUN;local;integer' 1>> "${TEMP_DIR:?}/zip-content/setprop-settings-list.csv" || ui_error 'Failed to generate setprop settings list (2)'
-printf '%s\n' 'KEY_TEST_ONLY;local;integer' 1>> "${TEMP_DIR:?}/zip-content/setprop-settings-list.csv" || ui_error 'Failed to generate setprop settings list (3)'
+printf '%s\n' 'KEY_TEST_ONLY;local;numeric-boolean' 1>> "${TEMP_DIR:?}/zip-content/setprop-settings-list.csv" || ui_error 'Failed to generate setprop settings list (3)'
 
 while IFS='#=; ' read -r _ PROP_NAME PROP_VALUE PROP PROP_VISIBILITY PROP_TYPE _; do
   if test "${PROP?}" != 'setprop'; then continue; fi

includes/common.sh

@@ -79,7 +79,7 @@ export ftp_proxy="${ftp_proxy-}"
 {
   readonly WGET_CMD='wget'
   readonly DL_UA='Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:128.0) Gecko/20100101 Firefox/128.0'
-  readonly DL_ACCEPT_HEADER='Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8'
+  readonly DL_ACCEPT_HEADER='Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'
   readonly DL_ACCEPT_ALL_HEADER='Accept: */*'
   readonly DL_ACCEPT_LANG_HEADER='Accept-Language: en-US,en;q=0.5'
   readonly DL_DNT_HEADER='DNT: 1'
@@ -531,7 +531,9 @@ send_web_request_and_output_response()
   if test -n "${_authorization?}"; then set -- "${@}" --header "Authorization: ${_authorization:?}" || return "${?}"; fi
   if test "${_method:?}" = 'POST'; then
     _body_data_length="$(_get_byte_length "${_body_data?}")" || return "${?}"
-    set -- "${@}" --header 'Content-Type: text/plain;charset=UTF-8' --header "Content-Length: ${_body_data_length:?}" || return "${?}"
+    if test "${_body_data_length:?}" -gt 0; then
+      set -- "${@}" --header 'Content-Type: text/plain;charset=UTF-8' --header "Content-Length: ${_body_data_length:?}" || return "${?}"
+    fi
   fi
   if test -n "${_origin?}"; then set -- "${@}" --header "Origin: ${_origin:?}" || return "${?}"; fi
   if test -n "${_cookies?}"; then set -- "${@}" --header "Cookie: ${_cookies:?}" || return "${?}"; fi
@@ -766,6 +768,7 @@ dl_type_two()
   while true; do
     _http_headers="$(send_web_request_and_output_headers "${_last_location_url:?}" 'GET')"
     _status_code="$(parse_headers_and_get_status_code "${_http_headers?}")"
+    if test "${DL_DEBUG:?}" = 'true'; then printf '%s\n' "Status code: ${_status_code?}"; fi
 
     case "${_status_code?}" in
       2*) # Final location URL found (usually 200)
@@ -779,11 +782,11 @@ dl_type_two()
           }
         ;;
       404)
-        report_failure 2 "77" "get location url ${_count:?}" 'THE FILE HAS BEEN DELETED ON THE SERVER!!!'
+        report_failure 2 "77" "get location url ${_count:?}" 'WARNING: THE FILE HAS BEEN DELETED ON THE SERVER!!!'
         return "${?}"
         ;;
       *)
-        report_failure 2 "78" "get location url ${_count:?}" "UNSUPPORTED HTTP STATUS CODE: ${_status_code?}"
+        report_failure 2 "78" "get location url ${_count:?}" "Unsupported HTTP status code: ${_status_code?}"
         return "${?}"
         ;;
     esac
@@ -796,10 +799,10 @@ dl_type_two()
 
   _loc_code="$(printf '%s\n' "${_last_location_url:?}" | cut -d '/' -f '5-' -s)" ||
     report_failure 2 "${?}" 'get location code' || return "${?}"
-  # DEBUG => echo "${_loc_code:?}"
+  if test "${DL_DEBUG:?}" = 'true'; then printf '%s\n' "Loc code: ${_loc_code?}"; fi
 
   sleep 0.2
-  _json_response="$(send_web_request_and_output_response "${_base_api_url:?}/accounts" 'POST' "${_base_referrer:?}" "${_base_origin:?}" '' '' '{}')" ||
+  _json_response="$(send_web_request_and_output_response "${_base_api_url:?}/accounts" 'POST' "${_base_referrer:?}" "${_base_origin:?}" '' '' '')" ||
     report_failure 2 "${?}" 'do AJAX post req' || return "${?}"
   if test "${DL_DEBUG:?}" = 'true'; then printf '%s\n' "${_json_response?}"; fi
 
@@ -867,7 +870,7 @@ dl_file()
 
     if test "${CI:-false}" = 'false'; then sleep 0.5; else sleep 3; fi
     case "${_domain:?}" in
-      *\.'go''file''.io')
+      *\.'go''file''.io' | 'go''file''.io')
         printf '\n %s: ' 'DL type 2'
         dl_type_two "${_url:?}" "${MAIN_DIR:?}/cache/${1:?}/${2:?}" || _status="${?}"
         ;;

tools/README.rst

@@ -9,7 +9,7 @@ TOOLS
 
 - zipsigner_ **3.0** => zipsigner.jar
 - zipsigner_ **3.0** (Dalvik) => zipsigner-dvk.jar
-- `BusyBox for Windows`_ **1.38.0-PRE-5578-g14ccc45d5 (2025-02-03)** => win/busybox.exe
+- `BusyBox for Windows`_ **1.38.0-PRE-5580-g3de63bc17 (2025-03-17)** => win/busybox.exe
 - `BusyBox legacy for Windows`_ **1.21.0-TIG-931-g7e6a84d (2012-11-29)** => win/busybox-legacy.bin
 - Zip_ **3.0** => win/zip.exe
 - UnZip_ **6.0** => win/unzip.exe

tools/get-signature.sh

@@ -6,6 +6,25 @@
 # shellcheck disable=SC3043 # In POSIX sh, local is undefined
 
 export SCRIPT_NAME='Get signature'
-export SCRIPT_VERSION='0.0.1'
+export SCRIPT_VERSION='0.0.3'
 
-"${APKSIGNER_PATH:-apksigner}" verify --min-sdk-version 24 --print-certs -- "${1:?}" | grep -m 1 -F -e 'certificate SHA-256 digest' | cut -d ':' -f '2-' -s | tr -d -- ' ' | tr -- '[:lower:]' '[:upper:]' | sed -e 's/../&:/g;s/:$//'
+get_cert_sha256()
+{
+  local _cert_sha256
+
+  test -n "${APKSIGNER_PATH-}" || APKSIGNER_PATH="$(command -v 'apksigner')" || APKSIGNER_PATH="$(command -v 'apksigner.bat')" || :
+
+  if test -n "${APKSIGNER_PATH-}"; then
+    _cert_sha256="$("${APKSIGNER_PATH:?}" verify --min-sdk-version 24 --print-certs -- "${1:?}" | grep -m 1 -F -e 'certificate SHA-256 digest:' | cut -d ':' -f '2-' -s | tr -d -- ' ' | tr -- '[:lower:]' '[:upper:]' | sed -e 's/../&:/g;s/:$//')" || _cert_sha256=''
+  elif command 1> /dev/null -v 'keytool'; then
+    _cert_sha256="$(keytool -printcert -jarfile "${1:?}" | grep -m 1 -F -e 'SHA256:' | cut -d ':' -f '2-' -s | tr -d -- ' ')" || _cert_sha256=''
+  fi
+
+  if test -n "${_cert_sha256?}"; then
+    printf '%s\n' "sha256-cert-digest=\"${_cert_sha256:?}\""
+  else
+    return 1
+  fi
+}
+
+get_cert_sha256 "${@}"

tools/win/busybox.exe

@@ -28,9 +28,17 @@ unset RANDOM_IS_SEEDED
 
 ### PREVENTIVE CHECKS ###
 
-command 1> /dev/null -v printf || {
+_redirect_command()
+{
+  eval " ${1:?}() { busybox '${1:?}' \"\${@}\"; } " || {
+    echo 1>&2 "ERROR: Replacing ${1?} failed"
+    exit 100
+  }
+}
+
+command 1> /dev/null -v 'printf' || {
   if command 1> /dev/null -v busybox; then
-    alias printf='busybox printf'
+    _redirect_command 'printf'
   else
     {
       printf()
@@ -48,7 +56,7 @@ command 1> /dev/null -v printf || {
 
 command 1> /dev/null -v uname || {
   if command 1> /dev/null -v busybox; then
-    alias uname='busybox uname'
+    _redirect_command 'uname'
   elif command 1> /dev/null -v getprop; then
     {
       uname()
@@ -69,22 +77,26 @@ command 1> /dev/null -v uname || {
   fi
 }
 
-command 1> /dev/null -v dirname || {
+command 1> /dev/null -v 'dirname' || {
   dirname()
   {
     printf '%s\n' "${1%/*}"
   }
 }
 
-command 1> /dev/null -v unzip || {
+command 1> /dev/null -v 'unzip' || {
   if command 1> /dev/null -v busybox; then
-    alias unzip='busybox unzip'
+    _redirect_command 'unzip'
   else
     printf 1>&2 '\033[1;31m%s\033[0m\n' "ERROR: Missing => unzip"
     exit 100
   fi
 }
 
+command 1> /dev/null -v 'grep' || {
+  if command 1> /dev/null -v busybox; then _redirect_command 'grep'; fi
+}
+
 ### FUNCTIONS AND CODE ###
 
 # Detect whether we are in boot mode
@@ -243,8 +255,11 @@ package_extract_file 'customize.sh' "${_ub_our_main_script:?}"
 
 echo "Loading ${LAST_RANDOM:?}-customize.sh..."
 # shellcheck source=SCRIPTDIR/../../../../customize.sh
-. "${_ub_our_main_script:?}" || ui_error "Failed to source customize.sh"
-rm -f "${_ub_our_main_script:?}" || ui_error "Failed to delete customize.sh"
+command . "${_ub_our_main_script:?}" || ui_error "Failed to source '${_ub_our_main_script?}'"
+
+if test -f "${_ub_our_main_script:?}"; then
+  rm "${_ub_our_main_script:?}" || ui_error "Failed to delete '${_ub_our_main_script?}'"
+fi
 unset _ub_our_main_script
 
 if test "${_ub_we_mounted_tmp:?}" = true; then

tools/win/man/cat1/busybox.1.gz

@@ -108,7 +108,7 @@ _log_path_setter()
   if test ! -e "${1:?}"; then return 1; fi
 
   local _path
-  _path="$(readlink -f "${1:?}")" || _path="$(realpath "${1:?}")" || return 1
+  _path="$(readlink 2> /dev/null -f "${1:?}")" || _path="$(realpath "${1:?}")" || return 1
   if test -w "${_path:?}"; then
     LOG_PATH="${_path:?}/debug-a5k.log"
     return 0

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

@@ -708,7 +708,7 @@ mount_partition_if_possible()
 
 _get_local_settings()
 {
-  if test "${LOCAL_SETTINGS_READ:-false}" = 'true'; then return; fi
+  test "${LOCAL_SETTINGS_READ:-false}" = 'false' || return
 
   ui_debug 'Parsing local settings...'
   ui_debug ''
@@ -719,34 +719,53 @@ _get_local_settings()
   export LOCAL_SETTINGS LOCAL_SETTINGS_READ
 }
 
+_parse_setting_helper()
+{
+  local _val
+
+  # If the length is 2 it is empty: []
+  if _val="$(printf '%s\n' "${LOCAL_SETTINGS?}" | grep -m 1 -F -e "[${1:?}]" | cut -d ':' -f '2-' -s)" && _val="${_val# }" && test "${#_val}" -gt 2; then
+    printf '%s\n' "${_val?}" | cut -c "2-$((${#_val} - 1))"
+    return 0
+  fi
+
+  return 1
+}
+
 parse_setting()
 {
-  local _var _use_last_choice
+  local _var _sett_type _sett_name _sett_default_val _sett_use_prev_choice
+
+  _sett_type="${1:-app}"
+  _sett_name="${2:?}"
+  _sett_default_val="${3?}"
+  _sett_use_prev_choice="${4:-true}"
 
-  _use_last_choice="${3:-true}"
   _get_local_settings
 
-  _var="$(printf '%s\n' "${LOCAL_SETTINGS?}" | grep -m 1 -F -e "[zip.${MODULE_ID:?}.${1:?}]" | cut -d ':' -f '2-' -s)" || _var=''
-  _var="${_var# }"
-  if test "${#_var}" -gt 2; then
-    printf '%s\n' "${_var?}" | cut -c "2-$((${#_var} - 1))"
+  if test "${_sett_type:?}" = 'app'; then
+    if _parse_setting_helper "zip.${MODULE_ID:?}.APP_${_sett_name:?}" || _parse_setting_helper "zip.${MODULE_ID:?}.INSTALL_${_sett_name:?}"; then
+      return
+    fi
+    _sett_name="APP_${_sett_name:?}"
+  elif _parse_setting_helper "zip.${MODULE_ID:?}.${_sett_name:?}"; then
     return
   fi
 
   # Fallback to the last choice
-  if test "${_use_last_choice:?}" = 'true' && _var="$(simple_file_getprop "${1:?}" "${SYS_PATH:?}/etc/zips/${MODULE_ID:?}.prop")" && test -n "${_var?}"; then
+  if test "${_sett_use_prev_choice:?}" = 'true' && _var="$(simple_file_getprop "${_sett_name:?}" "${SYS_PATH:?}/etc/zips/${MODULE_ID:?}.prop")" && test -n "${_var?}"; then
     printf '%s\n' "${_var:?}"
     return
-  elif test "${_use_last_choice:?}" = 'custom' && _var="$(simple_file_getprop "${4:?}" "${SYS_PATH:?}/etc/zips/${MODULE_ID:?}.prop")" && test -n "${_var?}"; then
+  elif test "${_sett_use_prev_choice:?}" = 'custom' && _var="$(simple_file_getprop "${5:?}" "${SYS_PATH:?}/etc/zips/${MODULE_ID:?}.prop")" && test -n "${_var?}"; then
     case "${_var:?}" in
-      "${5:?}") printf '1\n' ;;
-      *) printf '0\n' ;;
+      "${6:?}") printf '%s\n' '1' ;;
+      *) printf '%s\n' '0' ;;
     esac
     return
   fi
 
   # Fallback to the default value
-  printf '%s\n' "${2?}"
+  printf '%s\n' "${_sett_default_val?}"
 }
 
 remount_read_write()
@@ -1025,7 +1044,7 @@ initialize()
   # Make sure that the commands are still overridden here (most shells don't have the ability to export functions)
   if test "${TEST_INSTALL:-false}" != 'false' && test -f "${RS_OVERRIDE_SCRIPT:?}"; then
     # shellcheck source=SCRIPTDIR/../../recovery-simulator/inc/configure-overrides.sh
-    . "${RS_OVERRIDE_SCRIPT:?}" || exit "${?}"
+    command . "${RS_OVERRIDE_SCRIPT:?}" || ui_error "Sourcing override script failed with error: ${?}"
   fi
 
   PRODUCT_PATH=''
@@ -1056,11 +1075,11 @@ initialize()
 
   _get_local_settings
 
-  DRY_RUN="$(parse_setting 'DRY_RUN' "${DRY_RUN:?}" 'false')"
-  KEY_TEST_ONLY="$(parse_setting 'KEY_TEST_ONLY' "${KEY_TEST_ONLY:?}" 'false')"
+  DRY_RUN="$(parse_setting 'general' 'DRY_RUN' "${DRY_RUN:?}" 'false')"
+  KEY_TEST_ONLY="$(parse_setting 'general' 'KEY_TEST_ONLY' "${KEY_TEST_ONLY:?}" 'false')"
 
-  LIVE_SETUP_DEFAULT="$(parse_setting 'LIVE_SETUP_DEFAULT' "${LIVE_SETUP_DEFAULT:?}" 'false')"
-  LIVE_SETUP_TIMEOUT="$(parse_setting 'LIVE_SETUP_TIMEOUT' "${LIVE_SETUP_TIMEOUT:?}" 'false')"
+  LIVE_SETUP_DEFAULT="$(parse_setting 'general' 'LIVE_SETUP_DEFAULT' "${LIVE_SETUP_DEFAULT:?}" 'false')"
+  LIVE_SETUP_TIMEOUT="$(parse_setting 'general' 'LIVE_SETUP_TIMEOUT' "${LIVE_SETUP_TIMEOUT:?}" 'false')"
 
   case "${KEY_TEST_ONLY?}" in '' | *[!0-1]*) KEY_TEST_ONLY=1 ;; *) ;; esac
   if test "${KEY_TEST_ONLY:?}" -eq 1; then DRY_RUN=2; fi
@@ -1173,12 +1192,17 @@ initialize()
 
   IS_EMU='false'
   case "${BUILD_DEVICE?}" in
-    'windows_x86_64' | 'emu64'*) IS_EMU='true' ;;
-    *) ;;
+    'windows_'* | 'emu64'*) IS_EMU='true' ;;
+    'generic_'*) if is_string_starting_with 'EMULATOR' "$(sys_getprop 'ro.serialno' || :)"; then IS_EMU='true'; fi ;;
+    *)
+      if
+        is_string_starting_with 'sdk_google_phone_' "${BUILD_PRODUCT?}" ||
+          is_valid_prop "$(simple_getprop 'ro.leapdroid.version' || printf '%s\n' 'unknown' || :)"
+      then
+        IS_EMU='true'
+      fi
+      ;;
   esac
-  if is_string_starting_with 'sdk_google_phone_' "${BUILD_PRODUCT?}" || is_valid_prop "$(simple_getprop 'ro.leapdroid.version' || printf '%s\n' 'unknown' || :)"; then
-    IS_EMU='true'
-  fi
   readonly IS_EMU
   export IS_EMU
 
@@ -1360,7 +1384,7 @@ clean_previous_installations()
   readonly IS_INCLUDED='true'
   export IS_INCLUDED
   # shellcheck source=SCRIPTDIR/../scripts/uninstall.sh
-  . "${TMP_PATH:?}/uninstall.sh"
+  command . "${TMP_PATH:?}/uninstall.sh" || ui_error "Sourcing uninstall script failed with error: ${?}"
 
   delete "${SYS_PATH:?}/etc/zips/${MODULE_ID:?}.prop"
 
@@ -1451,7 +1475,7 @@ prepare_installation()
     echo '# SPDX-FileCopyrightText: none'
     echo '# SPDX-License-Identifier: CC0-1.0'
     echo ''
-    echo 'install.type=system'
+    echo 'install.destination=system'
     echo "install.build.type=${BUILD_TYPE:?}"
     echo "install.version.code=${MODULE_VERCODE:?}"
     echo "install.version=${MODULE_VERSION:?}"
@@ -2121,7 +2145,7 @@ copy_file()
 
 move_file()
 {
-  mv -f "$1" "$2"/ || ui_error "Failed to move the file '$1' to '$2'" 100
+  mv -f "$1" "$2"/ || ui_error "Failed to move the file '$1' to '$2'" 101
 }
 
 move_rename_file()
@@ -2175,12 +2199,31 @@ delete_temp()
 {
   for filename in "${@}"; do
     if test -e "${TMP_PATH:?}/${filename?}"; then
-      #ui_debug "Deleting '${TMP_PATH?}/${filename?}'..."
-      rm -rf -- "${TMP_PATH:?}/${filename:?}" || ui_error 'Failed to delete temp files/folders' 103
+      # ui_debug "Deleting '${TMP_PATH?}/${filename?}'..."
+      rm -rf -- "${TMP_PATH:?}/${filename:?}" || ui_error 'Failed to delete temp files/folders in delete_temp()' 103
     fi
   done
 }
 
+delete_if_sha256_match()
+{
+  local _filename _filehash _hash
+
+  if test -f "${1:?}"; then
+    _filename="${1:?}"
+    _filehash="$(sha256sum -- "${_filename:?}" | cut -d ' ' -f '1' -s)" || ui_error 'Failed to calculate SHA256 hash' 103
+    shift
+    for _hash in "${@}"; do
+      if test "${_hash:?}" = "${_filehash:?}"; then
+        ui_debug "Deleting '${_filename:?}'..."
+        rm -f -- "${_filename:?}" || ui_error 'Failed to delete file in delete_if_sha256_match()' 103
+        return
+      fi
+    done
+    ui_debug "Deletion of '${_filename:?}' skipped due to hash mismatch!"
+  fi
+}
+
 delete_dir_if_empty()
 {
   if test -d "$1"; then

zip-content/customize.sh

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