Sync with microG unofficial installer

Author: ale5000-git

zip-content/inc/common-functions.sh

@@ -802,9 +802,10 @@ install_survival_script()
   if test -d "${SYS_PATH:?}/addon.d"; then
     ui_msg 'Installing survival script...'
     write_file_list "${TMP_PATH:?}/files" "${TMP_PATH:?}/files/" "${TMP_PATH:?}/backup-filelist.lst"
-    replace_line_in_file_with_file "${TMP_PATH:?}/addon.d/${1:?}.sh" '%PLACEHOLDER-1%' "${TMP_PATH:?}/backup-filelist.lst"
+    replace_line_in_file_with_file "${TMP_PATH:?}/origin/addon.d/${1:?}.sh" '%PLACEHOLDER-1%' "${TMP_PATH:?}/backup-filelist.lst"
+    set_perm 0 0 0755 "${TMP_PATH:?}/origin/addon.d/${1:?}.sh"
     test "${DRY_RUN:?}" -eq 0 || return
-    copy_file "${TMP_PATH:?}/addon.d/${1:?}.sh" "${SYS_PATH:?}/addon.d"
+    copy_file "${TMP_PATH:?}/origin/addon.d/${1:?}.sh" "${SYS_PATH:?}/addon.d"
   else
     ui_warning 'addon.d scripts are not supported by your ROM'
     ui_msg_empty_line
@@ -1506,11 +1507,6 @@ prepare_installation()
       set_perm 0 2000 0755 "${entry:?}"
     done
   fi
-
-  if test -d "${TMP_PATH:?}/addon.d"; then
-    set_std_perm_recursive "${TMP_PATH:?}/addon.d"
-    find "${TMP_PATH:?}/addon.d" -type f -name '*.sh' -exec chmod 0755 '{}' '+' || ui_error 'Failed to chmod addon.d scripts'
-  fi
 }
 
 _something_exists()

zip-content/addon.d/00-1-google-sync.sh …ntent/origin/addon.d/00-1-google-sync.shzip-content/addon.d/00-1-google-sync.sh renamed to zip-content/origin/addon.d/00-1-google-sync.sh zip-content/addon.d/00-1-google-sync.sh renamed to zip-content/origin/addon.d/00-1-google-sync.sh

@@ -29,7 +29,6 @@ APP_CALENDARSYNC="$(parse_setting 'app' 'CALENDARSYNC' "${APP_CALENDARSYNC:?}")"
 if test "${SETUP_TYPE:?}" = 'install'; then
   ui_msg 'Extracting...'
   custom_package_extract_dir 'origin' "${TMP_PATH:?}"
-  custom_package_extract_dir 'addon.d' "${TMP_PATH:?}"
   create_dir "${TMP_PATH:?}/files/etc"
 
   ui_msg 'Configuring...'