Sync with microG unofficial installer

Author: ale5000-git

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

@@ -100,7 +100,7 @@ _ub_detect_bootmode()
   export BOOTMODE
 }
 
-_show_text_on_recovery()
+_send_text_to_recovery()
 {
   if test "${BOOTMODE:?}" = 'true'; then
     printf '%s\n' "${1?}"
@@ -116,7 +116,7 @@ ui_error()
 {
   ERROR_CODE=79
   if test -n "${2:-}"; then ERROR_CODE="${2:?}"; fi
-  _show_text_on_recovery "ERROR ${ERROR_CODE:?}: ${1:?}"
+  _send_text_to_recovery "ERROR ${ERROR_CODE:?}: ${1:?}"
   printf 1>&2 '\033[1;31m%s\033[0m\n' "ERROR ${ERROR_CODE:?}: ${1:?}"
   abort '' 2> /dev/null || exit "${ERROR_CODE:?}"
 }
@@ -212,7 +212,7 @@ _ub_we_mounted_tmp=false
   else
     _ub_we_mounted_tmp=true
 
-    _show_text_on_recovery 'WARNING: Creating (if needed) and mounting the temp folder...'
+    _send_text_to_recovery 'WARNING: Creating (if needed) and mounting the temp folder...'
     printf 1>&2 '\033[0;33m%s\033[0m\n' 'WARNING: Creating (if needed) and mounting the temp folder...'
     if test ! -e '/tmp'; then
       mkdir -p '/tmp' || ui_error 'Failed to create the temp folder'

zip-content/customize.sh

@@ -131,7 +131,7 @@ ui_debug()
   printf '%s\n' "${1?}"
 }
 
-_show_text_on_recovery()
+_send_text_to_recovery()
 {
   if test "${RECOVERY_OUTPUT:?}" != 'true'; then return; fi # Nothing to do here
 
@@ -149,7 +149,7 @@ enable_debug_log()
   if test "${DEBUG_LOG_ENABLED}" -eq 1; then return; fi
 
   ui_debug "Creating log: ${LOG_PATH:?}"
-  _show_text_on_recovery "Creating log: ${LOG_PATH:?}"
+  _send_text_to_recovery "Creating log: ${LOG_PATH:?}"
 
   touch "${LOG_PATH:?}" || {
     export DEBUG_LOG_ENABLED=0
@@ -193,7 +193,7 @@ ui_error()
   if test -n "${2:-}"; then ERROR_CODE="${2:?}"; fi
 
   if test "${RECOVERY_OUTPUT:?}" = 'true'; then
-    _show_text_on_recovery "ERROR ${ERROR_CODE:?}: ${1:?}"
+    _send_text_to_recovery "ERROR ${ERROR_CODE:?}: ${1:?}"
   else
     printf 1>&2 '\033[1;31m%s\033[0m\n' "ERROR ${ERROR_CODE:?}: ${1:?}"
   fi
@@ -204,7 +204,7 @@ ui_error()
 ui_warning()
 {
   if test "${RECOVERY_OUTPUT:?}" = 'true'; then
-    _show_text_on_recovery "WARNING: ${1:?}"
+    _send_text_to_recovery "WARNING: ${1:?}"
   else
     printf 1>&2 '\033[0;33m%s\033[0m\n' "WARNING: ${1:?}"
   fi
@@ -213,7 +213,7 @@ ui_warning()
 ui_msg()
 {
   if test "${RECOVERY_OUTPUT:?}" = 'true'; then
-    _show_text_on_recovery "${1:?}"
+    _send_text_to_recovery "${1:?}"
   else
     printf '%s\n' "${1:?}"
   fi
@@ -343,12 +343,13 @@ set_perm_safe 0 0 0755 "${TMP_PATH:?}"
 
 PREVIOUS_PATH="${PATH:-%empty}"
 DEVICE_GETPROP="$(command -v getprop)" || DEVICE_GETPROP=''
-DEVICE_STAT="$(command -v stat)" || DEVICE_STAT=''
 DEVICE_MOUNT="$(command -v mount)" || DEVICE_MOUNT=''
+DEVICE_DUMPSYS="$(command -v dumpsys)" || DEVICE_DUMPSYS=''
+DEVICE_STAT="$(command -v stat)" || DEVICE_STAT=''
 DEVICE_PM="$(command -v pm)" || DEVICE_PM=''
 DEVICE_AM="$(command -v am)" || DEVICE_AM=''
-readonly PREVIOUS_PATH DEVICE_GETPROP DEVICE_STAT DEVICE_MOUNT DEVICE_PM DEVICE_AM
-export PREVIOUS_PATH DEVICE_GETPROP DEVICE_STAT DEVICE_MOUNT DEVICE_PM DEVICE_AM
+readonly PREVIOUS_PATH DEVICE_GETPROP DEVICE_MOUNT DEVICE_DUMPSYS DEVICE_STAT DEVICE_PM DEVICE_AM
+export PREVIOUS_PATH DEVICE_GETPROP DEVICE_MOUNT DEVICE_DUMPSYS DEVICE_STAT DEVICE_PM DEVICE_AM
 
 if test "${TEST_INSTALL:-false}" = 'false'; then
   create_dir_safe "${TMP_PATH:?}/bin"

zip-content/inc/common-functions.sh

@@ -1508,7 +1508,7 @@ finalize_and_report_success()
 }
 
 # Message related functions
-_show_text_on_recovery()
+_send_text_to_recovery()
 {
   if test "${RECOVERY_OUTPUT:?}" != 'true'; then return; fi # Nothing to do here
 
@@ -1527,7 +1527,7 @@ ui_error()
   if test -n "${2:-}"; then ERROR_CODE="${2:?}"; fi
 
   if test "${RECOVERY_OUTPUT:?}" = 'true'; then
-    _show_text_on_recovery "ERROR ${ERROR_CODE:?}: ${1:?}"
+    _send_text_to_recovery "ERROR ${ERROR_CODE:?}: ${1:?}"
   else
     printf 1>&2 '\033[1;31m%s\033[0m\n' "ERROR ${ERROR_CODE:?}: ${1:?}"
   fi
@@ -1538,7 +1538,7 @@ ui_error()
 ui_recovered_error()
 {
   if test "${RECOVERY_OUTPUT:?}" = 'true'; then
-    _show_text_on_recovery "RECOVERED ERROR: ${1:?}"
+    _send_text_to_recovery "RECOVERED ERROR: ${1:?}"
   else
     printf 1>&2 '\033[1;31;103m%s\033[0m\n' "RECOVERED ERROR: ${1:?}"
   fi
@@ -1547,7 +1547,7 @@ ui_recovered_error()
 ui_warning()
 {
   if test "${RECOVERY_OUTPUT:?}" = 'true'; then
-    _show_text_on_recovery "WARNING: ${1:?}"
+    _send_text_to_recovery "WARNING: ${1:?}"
   else
     printf 1>&2 '\033[0;33m%s\033[0m\n' "WARNING: ${1:?}"
   fi
@@ -1556,7 +1556,7 @@ ui_warning()
 ui_msg_empty_line()
 {
   if test "${RECOVERY_OUTPUT:?}" = 'true'; then
-    _show_text_on_recovery ' '
+    _send_text_to_recovery ' '
   else
     printf '\n'
   fi
@@ -1565,7 +1565,7 @@ ui_msg_empty_line()
 ui_msg()
 {
   if test "${RECOVERY_OUTPUT:?}" = 'true'; then
-    _show_text_on_recovery "${1:?}"
+    _send_text_to_recovery "${1:?}"
   else
     printf '%s\n' "${1:?}"
   fi