Sync with microG unofficial installer

Author: ale5000-git

zip-content/inc/common-functions.sh

@@ -1211,19 +1211,19 @@ initialize()
     ui_error 'Downgrade not allowed!!!' 95
   fi
 
-  IS_INSTALLATION='true'
+  SETUP_TYPE='install'
   if
     test "${LIVE_SETUP_ENABLED:?}" = 'true' && {
       test "${MODULE_VERCODE:?}" -eq "${PREV_MODULE_VERCODE:?}" || test "${PREV_INSTALL_FAILED:?}" = 'true'
     }
   then
     choose 'What do you want to do?' '+) Reinstall' '-) Uninstall'
     if test "${?}" != '3'; then
-      IS_INSTALLATION='false'
+      SETUP_TYPE='uninstall'
     fi
   fi
-  readonly IS_INSTALLATION
-  export IS_INSTALLATION
+  readonly SETUP_TYPE
+  export SETUP_TYPE
 
   remount_read_write "${SYS_MOUNTPOINT:?}" || {
     deinitialize
@@ -1864,11 +1864,11 @@ finalize_correctly()
   deinitialize
   touch "${TMP_PATH:?}/installed"
 
-  if test "${IS_INSTALLATION:?}" = 'true'; then
-    ui_msg 'Installation finished.'
-  else
-    ui_msg 'Uninstallation finished.'
-  fi
+  case "${SETUP_TYPE?}" in
+    'install') ui_msg 'Installation finished.' ;;
+    'uninstall') ui_msg 'Uninstallation finished.' ;;
+    *) ui_error 'Invalid setup type' ;;
+  esac
 }
 
 # Error checking functions

zip-content/scripts/install.sh

@@ -30,7 +30,7 @@ INSTALL_CALENDARSYNC="$(parse_setting 'INSTALL_CALENDARSYNC' "${INSTALL_CALENDAR
 display_info
 ui_msg_empty_line
 
-if test "${IS_INSTALLATION:?}" = 'true'; then
+if test "${SETUP_TYPE:?}" = 'install'; then
   ui_msg 'Starting installation...'
   ui_msg_empty_line
 
@@ -56,7 +56,7 @@ else
   ui_msg_empty_line
 fi
 
-if test "${IS_INSTALLATION:?}" = 'true'; then
+if test "${SETUP_TYPE:?}" = 'install'; then
   disable_app 'com.google.android.syncadapters.calendar'
   disable_app 'com.google.android.syncadapters.contacts'
   disable_app 'com.google.android.backuptransport'
@@ -65,7 +65,7 @@ fi
 # Clean previous installations
 clean_previous_installations
 
-if test "${IS_INSTALLATION:?}" != 'true'; then
+if test "${SETUP_TYPE:?}" = 'uninstall'; then
   clear_app 'com.google.android.syncadapters.calendar'
   clear_app 'com.google.android.syncadapters.contacts'
   clear_app 'com.google.android.backuptransport'

zip-content/scripts/uninstall.sh

@@ -54,7 +54,7 @@ if test "${IS_INCLUDED:-false}" = 'false'; then
 
   # shellcheck disable=SC2034
   {
-    IS_INSTALLATION='false'
+    SETUP_TYPE='uninstall'
     FIRST_INSTALLATION='true'
     API=999
     SYS_PATH="${ANDROID_ROOT:-/system}"
@@ -138,7 +138,7 @@ uninstall_list | while IFS='|' read -r FILENAME INTERNAL_NAME _; do
 
   if test -n "${INTERNAL_NAME}"; then
     # Only delete app updates during uninstallation or first-time installation
-    if test "${IS_INSTALLATION:?}" != 'true' || test "${FIRST_INSTALLATION:?}" = 'true'; then
+    if test "${SETUP_TYPE:?}" = 'uninstall' || test "${FIRST_INSTALLATION:?}" = 'true'; then
       delete "${DATA_PATH:?}/app/${INTERNAL_NAME}"
       delete "${DATA_PATH:?}/app/${INTERNAL_NAME}.apk"
       delete "${DATA_PATH:?}/app/${INTERNAL_NAME}"-*