chore: sync with microG unofficial installer

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

Author: ale5000-git

README.rst

@@ -17,6 +17,10 @@ Description
 -----------
 Google sync add-on is a flashable zip created by ale5000 for a simple installation of Google sync adapters on Android from 4.4 to 16 (excluding Android 6.x).
 
+**IMPORTANT:** In addition to the normal installation as a pure flashable zip, there are plans for the future (but not in the short term) to also support the installation as a *Magisk* module.
+
+Although you may find various references to *Magisk* in the code, support is **NOT** yet ready.
+
 This project is available on GitHub_, on GitLab_ as well as on XDA_.
 
 .. _GitHub: https://github.com/micro5k/google-sync-addon

zip-content/META-INF/com/google/android/updater-script.dat

@@ -1,2 +1,4 @@
+#MAGISK
+
 Dummy file, the real script is inside update-binary.
-This is kept for compatibility.
+This file is kept for compatibility.

zip-content/customize.sh

@@ -421,7 +421,7 @@ detect_recovery_arch()
 detect_recovery_arch
 
 if test "${INSTALL_MODE:?}" != 'Pure'; then
-  ui_error "This ZIP currently cannot be installed as ${INSTALL_MODE?} module"
+  ui_error "This ZIP currently canNOT be installed as ${INSTALL_MODE?} module, although it is planned for the future"
 fi
 
 OUR_BB="${BASE_TMP_PATH:?}/busybox"
@@ -551,6 +551,12 @@ fi
 ui_debug ''
 disable_debug_log # Disable debug log if it was enabled and restore normal output
 
+if test "${DEBUG_LOG:?}" -ne 0; then
+  ui_msg "The log was created in: ${LOG_PATH?}"
+  ui_msg "You can get it with this command: adb pull \"${LOG_PATH:?}\" ."
+  ui_debug ''
+fi
+
 export PATH="${PREVIOUS_PATH?}"
 delete_recursive_safe "${TMP_PATH:?}"
 

zip-content/inc/common-functions.sh

@@ -507,18 +507,22 @@ _execute_system_remount()
 
 _remount_read_write_helper()
 {
+  local _mount_rw_output
   test "${DRY_RUN:?}" -lt 2 || return 2
 
-  if test -n "${DEVICE_MOUNT-}" && PATH="${PREVIOUS_PATH:?}" "${DEVICE_MOUNT:?}" 2> /dev/null -o 'remount,rw' "${1:?}"; then
+  _mount_rw_output=''
+  if test -n "${DEVICE_MOUNT-}" && _mount_rw_output="$(PATH="${PREVIOUS_PATH:?}" "${DEVICE_MOUNT:?}" 2>&1 -o 'remount,rw' "${1:?}")" && is_mounted_read_write "${1:?}"; then
     :
-  elif test -n "${DEVICE_MOUNT-}" && PATH="${PREVIOUS_PATH:?}" "${DEVICE_MOUNT:?}" 2> /dev/null -o 'remount,rw' "${1:?}" "${1:?}"; then
+  elif test -n "${DEVICE_MOUNT-}" && PATH="${PREVIOUS_PATH:?}" "${DEVICE_MOUNT:?}" 2> /dev/null -o 'remount,rw' "${1:?}" "${1:?}" && is_mounted_read_write "${1:?}"; then
+    :
+  elif mount -o 'remount,rw' "${1:?}" && is_mounted_read_write "${1:?}"; then
     :
   else
-    mount -o 'remount,rw' "${1:?}" || return "${?}"
+    ui_debug 'Output:'
+    ui_debug "${_mount_rw_output?}"
+    return 1
   fi
 
-  is_mounted_read_write "${1:?}" || return 1
-
   return 0
 }
 

zip-content/module.prop

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