Sync with microG unofficial installer

Author: ale5000-git

includes/common.sh

@@ -78,7 +78,7 @@ export ftp_proxy="${ftp_proxy-}"
 # shellcheck disable=SC2034
 {
   readonly WGET_CMD='wget'
-  readonly DL_UA='Mozilla/5.0 (Linux x86_64; rv:128.0) Gecko/20100101 Firefox/128.0'
+  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_ALL_HEADER='Accept: */*'
   readonly DL_ACCEPT_LANG_HEADER='Accept-Language: en-US,en;q=0.5'

zip-content/customize.sh

@@ -131,18 +131,34 @@ ui_debug()
   printf '%s\n' "${1?}"
 }
 
+_show_text_on_recovery()
+{
+  if test "${RECOVERY_OUTPUT:?}" != 'true'; then return; fi # Nothing to do here
+
+  if test -e "${RECOVERY_PIPE:?}"; then
+    printf 'ui_print %s\nui_print\n' "${1?}" >> "${RECOVERY_PIPE:?}"
+  else
+    printf 'ui_print %s\nui_print\n' "${1?}" 1>&"${OUTFD:?}"
+  fi
+
+  if test "${DEBUG_LOG_ENABLED:?}" -eq 1; then printf 1>&2 '%s\n' "${1?}"; fi
+}
+
 enable_debug_log()
 {
   if test "${DEBUG_LOG_ENABLED}" -eq 1; then return; fi
-  export DEBUG_LOG_ENABLED=1
 
   ui_debug "Creating log: ${LOG_PATH:?}"
+  _show_text_on_recovery "Creating log: ${LOG_PATH:?}"
+
   touch "${LOG_PATH:?}" || {
-    ui_warning "Unable to write the log file at: ${LOG_PATH:-}"
     export DEBUG_LOG_ENABLED=0
+    ui_warning "Unable to write the log file at: ${LOG_PATH:-}"
     return
   }
 
+  export DEBUG_LOG_ENABLED=1
+
   # If they are already in use, then use alternatives
   if {
     command 1>&6 || command 1>&7
@@ -171,19 +187,6 @@ disable_debug_log()
   fi
 }
 
-_show_text_on_recovery()
-{
-  if test "${RECOVERY_OUTPUT:?}" != 'true'; then return; fi # Nothing to do here
-
-  if test -e "${RECOVERY_PIPE:?}"; then
-    printf 'ui_print %s\nui_print\n' "${1?}" >> "${RECOVERY_PIPE:?}"
-  else
-    printf 'ui_print %s\nui_print\n' "${1?}" 1>&"${OUTFD:?}"
-  fi
-
-  if test "${DEBUG_LOG_ENABLED:?}" -eq 1; then printf 1>&2 '%s\n' "${1?}"; fi
-}
-
 ui_error()
 {
   ERROR_CODE=79

zip-content/inc/common-functions.sh

@@ -865,18 +865,22 @@ initialize()
   fi
 
   if mount_partition_if_exist "${SLOT:+product}${SLOT-}${NL:?}product${NL:?}" 'product'; then
+    PRODUCT_PATH="${LAST_MOUNTPOINT:?}"
     UNMOUNT_PRODUCT="${LAST_PARTITION_MUST_BE_UNMOUNTED:?}"
     remount_read_write_if_needed "${LAST_MOUNTPOINT:?}" false && PRODUCT_WRITABLE='true'
   fi
   if mount_partition_if_exist "${SLOT:+vendor}${SLOT-}${NL:?}vendor${NL:?}" 'vendor'; then
+    VENDOR_PATH="${LAST_MOUNTPOINT:?}"
     UNMOUNT_VENDOR="${LAST_PARTITION_MUST_BE_UNMOUNTED:?}"
     remount_read_write_if_needed "${LAST_MOUNTPOINT:?}" false && VENDOR_WRITABLE='true'
   fi
   if mount_partition_if_exist "${SLOT:+system_ext}${SLOT-}${NL:?}system_ext${NL:?}" 'system_ext'; then
+    SYS_EXT_PATH="${LAST_MOUNTPOINT:?}"
     UNMOUNT_SYS_EXT="${LAST_PARTITION_MUST_BE_UNMOUNTED:?}"
     remount_read_write_if_needed "${LAST_MOUNTPOINT:?}" false
   fi
   if mount_partition_if_exist "${SLOT:+odm}${SLOT-}${NL:?}odm${NL:?}" 'odm'; then
+    ODM_PATH="${LAST_MOUNTPOINT:?}"
     UNMOUNT_ODM="${LAST_PARTITION_MUST_BE_UNMOUNTED:?}"
     remount_read_write_if_needed "${LAST_MOUNTPOINT:?}" false
   fi
@@ -885,7 +889,7 @@ initialize()
   if mount_partition_if_exist "userdata${NL:?}DATAFS${NL:?}" 'data' "${ANDROID_DATA-}"; then
     DATA_PATH="${LAST_MOUNTPOINT:?}"
     UNMOUNT_DATA="${LAST_PARTITION_MUST_BE_UNMOUNTED:?}"
-    remount_read_write_if_needed "${DATA_PATH:?}" true
+    remount_read_write_if_needed "${LAST_MOUNTPOINT:?}" true
   else
     ui_warning "The data partition cannot be mounted, so updates of installed / removed apps cannot be automatically deleted and their Dalvik cache cannot be automatically cleaned. I suggest to manually do a factory reset after flashing this ZIP."
   fi
@@ -1345,8 +1349,8 @@ verify_disk_space()
   _free_space_bytes="$(get_free_disk_space_of_partition "${1:?}")" || _free_space_bytes='-1'
   display_free_space "${1:?}" "${_free_space_bytes?}" || :
 
-  if test "${PRODUCT_WRITABLE:?}" = 'true'; then display_free_space '/product' "$(get_free_disk_space_of_partition '/product' || :)"; fi
-  if test "${VENDOR_WRITABLE:?}" = 'true'; then display_free_space '/vendor' "$(get_free_disk_space_of_partition '/vendor' || :)"; fi
+  if test "${PRODUCT_WRITABLE:?}" = 'true'; then display_free_space "${PRODUCT_PATH:?}" "$(get_free_disk_space_of_partition "${PRODUCT_PATH:?}" || :)"; fi
+  if test "${VENDOR_WRITABLE:?}" = 'true'; then display_free_space "${VENDOR_PATH:?}" "$(get_free_disk_space_of_partition "${VENDOR_PATH:?}" || :)"; fi
 
   if test "${_needed_space_bytes:?}" -ge 0 && test "${_free_space_bytes:?}" -ge 0; then
     : # OK
@@ -1603,17 +1607,17 @@ unmount()
 
 unmount_extra_partitions()
 {
-  if test "${UNMOUNT_PRODUCT:?}" = '1'; then
-    unmount '/product'
+  if test "${UNMOUNT_PRODUCT:?}" = '1' && test -n "${PRODUCT_PATH-}"; then
+    unmount "${PRODUCT_PATH:?}"
   fi
-  if test "${UNMOUNT_VENDOR:?}" = '1'; then
-    unmount '/vendor'
+  if test "${UNMOUNT_VENDOR:?}" = '1' && test -n "${VENDOR_PATH-}"; then
+    unmount "${VENDOR_PATH:?}"
   fi
-  if test "${UNMOUNT_SYS_EXT:?}" = '1'; then
-    unmount '/system_ext'
+  if test "${UNMOUNT_SYS_EXT:?}" = '1' && test -n "${SYS_EXT_PATH-}"; then
+    unmount "${SYS_EXT_PATH:?}"
   fi
-  if test "${UNMOUNT_ODM:?}" = '1'; then
-    unmount '/odm'
+  if test "${UNMOUNT_ODM:?}" = '1' && test -n "${ODM_PATH-}"; then
+    unmount "${ODM_PATH:?}"
   fi
 
   return 0 # Never fail

zip-content/module.prop

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