Sync with microG unofficial installer

Author: ale5000-git

recovery-simulator/recovery.sh

@@ -185,7 +185,7 @@ link_folder()
 
 remove_folder_link()
 {
-  if test -h "${1:?}"; then
+  if test -L "${1:?}"; then
     rm -f -- "${1:?}"
   else
     rmdir -- "${1:?}"
@@ -262,9 +262,9 @@ if test "${ENV_RESETTED:-false}" = 'false'; then
   reset_env_and_rerun_myself()
   {
     if test "${COVERAGE:-false}" = 'false'; then
-      exec env -i -- ENV_RESETTED=true PATH="${PATH:?}" BB_GLOBBING='0' SHELL="${SHELL:?}" THIS_SCRIPT="${THIS_SCRIPT:?}" TMPDIR="${TMPDIR:-${RUNNER_TEMP:-${TMP:-${TEMP:-/tmp}}}}" DEBUG_LOG="${DEBUG_LOG-}" LIVE_SETUP_ALLOWED="${LIVE_SETUP_ALLOWED-}" FORCE_HW_BUTTONS="${FORCE_HW_BUTTONS-}" CI="${CI-}" "${SHELL:?}" -- "${THIS_SCRIPT:?}" "${@}"
+      exec env -i -- ENV_RESETTED=true PATH="${PATH:?}" BB_GLOBBING='0' SHELL="${SHELL:?}" THIS_SCRIPT="${THIS_SCRIPT:?}" TMPDIR="${TMPDIR:-${RUNNER_TEMP:-${TMP:-${TEMP:-/tmp}}}}" DEBUG_LOG="${DEBUG_LOG-}" LIVE_SETUP_ALLOWED="${LIVE_SETUP_ALLOWED-}" FORCE_HW_KEYS="${FORCE_HW_KEYS-}" CI="${CI-}" "${SHELL:?}" -- "${THIS_SCRIPT:?}" "${@}"
     else
-      exec env -i -- ENV_RESETTED=true PATH="${PATH:?}" BB_GLOBBING='0' SHELL="${SHELL:?}" THIS_SCRIPT="${THIS_SCRIPT:?}" TMPDIR="${TMPDIR:-${RUNNER_TEMP:-${TMP:-${TEMP:-/tmp}}}}" DEBUG_LOG="${DEBUG_LOG-}" LIVE_SETUP_ALLOWED="${LIVE_SETUP_ALLOWED-}" FORCE_HW_BUTTONS="${FORCE_HW_BUTTONS-}" CI="${CI-}" BASH_XTRACEFD="${BASH_XTRACEFD-}" BASH_ENV="${BASH_ENV-}" OLDPWD="${OLDPWD-}" SHELLOPTS="${SHELLOPTS-}" PS4="${PS4-}" "${SHELL:?}" -x -- "${THIS_SCRIPT:?}" "${@}"
+      exec env -i -- ENV_RESETTED=true PATH="${PATH:?}" BB_GLOBBING='0' SHELL="${SHELL:?}" THIS_SCRIPT="${THIS_SCRIPT:?}" TMPDIR="${TMPDIR:-${RUNNER_TEMP:-${TMP:-${TEMP:-/tmp}}}}" DEBUG_LOG="${DEBUG_LOG-}" LIVE_SETUP_ALLOWED="${LIVE_SETUP_ALLOWED-}" FORCE_HW_KEYS="${FORCE_HW_KEYS-}" CI="${CI-}" BASH_XTRACEFD="${BASH_XTRACEFD-}" BASH_ENV="${BASH_ENV-}" OLDPWD="${OLDPWD-}" SHELLOPTS="${SHELLOPTS-}" PS4="${PS4-}" "${SHELL:?}" -x -- "${THIS_SCRIPT:?}" "${@}"
     fi
   }
 
@@ -274,7 +274,7 @@ fi
 unset ENV_RESETTED
 if test -z "${DEBUG_LOG-}"; then unset DEBUG_LOG; fi
 if test -z "${LIVE_SETUP_ALLOWED-}"; then unset LIVE_SETUP_ALLOWED; fi
-if test -z "${FORCE_HW_BUTTONS-}"; then unset FORCE_HW_BUTTONS; fi
+if test -z "${FORCE_HW_KEYS-}"; then unset FORCE_HW_KEYS; fi
 
 if test -z "${CI-}"; then unset CI; fi
 if test -z "${SHELLOPTS-}"; then unset SHELLOPTS; fi

zip-content/customize.sh

@@ -61,7 +61,7 @@ export SKIPUNZIP ASH_STANDALONE
 ### GLOBAL VARIABLES ###
 
 export DEBUG_LOG_ENABLED=0
-readonly FORCE_HW_BUTTONS="${FORCE_HW_BUTTONS:-0}"
+readonly FORCE_HW_KEYS="${FORCE_HW_KEYS:-0}"
 
 readonly RECOVERY_API_VER="${1:-}"
 if test "${4:-}" = 'zip-install'; then
@@ -80,7 +80,7 @@ else
 fi
 export RECOVERY_OUTPUT
 
-if test "${FORCE_HW_BUTTONS:?}" = '0' && test -t 0 && { # Check if STDIN (0) is valid
+if test "${FORCE_HW_KEYS:?}" = '0' && test -t 0 && { # Check if STDIN (0) is valid
   test "${ZIP_INSTALL:?}" = 'true' || test "${TEST_INSTALL:-false}" != 'false'
 }; then
   readonly INPUT_FROM_TERMINAL='true'