Sync with microG unofficial installer

Author: ale5000-git

.github/workflows/base.yml

@@ -47,16 +47,21 @@ jobs:
       - name: "Execute code coverage"
         run: |
           # Executing code coverage...
-          sudo apt-get -qq -y install moreutils 1> /dev/null
+          sudo apt-get -qq -y install moreutils 1>/dev/null
           export OPENSOURCE_ONLY='true'
           bashcov './build.sh' # | TZ=UTC ts '[%H:%M:%S]'  # Timestamp disabled as it break GitHub notice
           # Testing zip installation...
-          # bash './recovery-simulator/recovery.sh' ./output/*.zip
-          # printf '\n\n'
-          # echo '==============='
-          # echo 'RECOVERY OUTPUT'
-          # echo '==============='
-          # cat './recovery-simulator/output/recovery-output-parsed.log'
+          #bash './recovery-simulator/recovery.sh' ./output/*.zip
+          #printf '\n\n'
+          #echo '==============='
+          #echo 'RECOVERY OUTPUT'
+          #echo '==============='
+          #cat './recovery-simulator/output/recovery-output.log'
+          #printf '\n\n'
+          #echo '==============='
+          #echo 'STDOUT / STDERR'
+          #echo '==============='
+          #cat './recovery-simulator/output/recovery-stdout-stderr.log'
       - name: "Upload reports to Codecov"
         uses: codecov/codecov-action@v3
         with:

README.rst

@@ -33,7 +33,13 @@ Release
 -------
 .. image:: https://img.shields.io/github/v/release/micro5k/google-sync-addon.svg?include_prereleases&cacheSeconds=3600
    :alt: GitHub (pre-)release
-   :target: https://github.com/micro5k/google-sync-addon/releases/latest
+   :target: docs/INSTRUCTIONS.rst
+
+See `here <docs/INSTRUCTIONS.rst>`_ for the instructions.
+
+.. image:: https://img.shields.io/github/downloads/micro5k/google-sync-addon/latest/total.svg?cacheSeconds=3600
+   :alt: Downloads of the latest release
+   :target: docs/INSTRUCTIONS.rst
 
 
 Copyright

build.gradle

@@ -61,6 +61,7 @@ tasks.register('buildOta', Exec) {
     doFirst {
         println 'Building the flashable OTA zip with Gradle...'
         executable "${projectDir}/build" + getScriptExt()
+        environment OPENSOURCE_ONLY: 'false'
     }
 }
 

gradle.properties

@@ -6,4 +6,4 @@ org.gradle.jvmargs=-Dfile.encoding=UTF-8
 org.gradle.warning.mode=all
 org.gradle.parallel=true
 org.gradle.caching=true
-org.gradle.configureondemand=true
+#org.gradle.configureondemand=true

gradle/wrapper/gradle-wrapper.jar.license

@@ -1,4 +1,4 @@
-SPDX-FileCopyrightText: Copyright 2007 the original author or authors.
+SPDX-FileCopyrightText: 2007 the original author or authors.
 SPDX-License-Identifier: Apache-2.0
 SPDX-FileType: ARCHIVE
 

recovery-simulator/recovery.sh

@@ -21,6 +21,42 @@ link_folder()
   ln -sf "${2}" "${1}" || mkdir -p "${1}" || fail_with_msg "Failed to link dir '${1}'"
 }
 
+ui_print()
+{
+  echo "ui_print ${1}"
+}
+
+recovery_flash_start()
+{
+  ui_print "I:Set page: 'install'"
+  ui_print "I:Set page: 'flash_confirm'"
+  ui_print "I:Set page: 'flash_zip'"
+  ui_print "I:operation_start: 'Flashing'"
+  ui_print "Installing zip file '${1}'"
+  #ui_print "Checking for MD5 file..."
+  #ui_print "MD5 matched for '${1}'."
+  ui_print "I:Update binary zip"
+}
+
+recovery_flash_end()
+{
+  if test "${1}" -eq 0; then
+    ui_print "I:Updater process ended with RC=0"
+  else
+    ui_print "Updater process ended with ERROR: ${1}"
+    ui_print "Error installing zip file '${2}'"
+  fi
+  ui_print "Updating partition details..."
+  ui_print "...done"
+  ui_print "I:Set page: 'flash_done'"
+  if test "${1}" -eq 0; then
+    ui_print "I:operation_end - status=0"
+  else
+    ui_print "I:operation_end - status=1"
+  fi
+  ui_print ''
+}
+
 if test -z "${1}"; then fail_with_msg 'You must pass the filename of the flashable ZIP as parameter'; fi
 
 # Reset environment
@@ -102,14 +138,15 @@ chmod +x "${TMPDIR}/updater" || fail_with_msg "chmod failed on '${TMPDIR}/update
 
 # Setup recovery output
 recovery_fd=99
+recovery_logs_dir="${THIS_SCRIPT_DIR}/output"
 if test -e "/proc/self/fd/${recovery_fd}"; then fail_with_msg 'Recovery FD already exist'; fi
-mkdir -p "${THIS_SCRIPT_DIR}/output"
-touch "${THIS_SCRIPT_DIR}/output/recovery-output.log"
+mkdir -p "${recovery_logs_dir}"
+touch "${recovery_logs_dir}/recovery-output-raw.log"
 if test "${uname_o_saved}" != 'MS/Windows'; then
-  sudo chattr +aAd "${THIS_SCRIPT_DIR}/output/recovery-output.log" || fail_with_msg "chattr failed on 'recovery-output.log'"
+  sudo chattr +aAd "${recovery_logs_dir}/recovery-output-raw.log" || fail_with_msg "chattr failed on 'recovery-output-raw.log'"
 fi
 # shellcheck disable=SC3023
-exec 99>> "${THIS_SCRIPT_DIR}/output/recovery-output.log"
+exec 99>> "${recovery_logs_dir}/recovery-output-raw.log"
 
 # Simulate the environment variables (part 2)
 PATH="${OVERRIDE_DIR}:${BASE_SIMULATION_PATH}/sbin:${ANDROID_ROOT}/bin:${PATH}"  # We have to keep the original folders inside PATH otherwise everything stop working
@@ -131,15 +168,17 @@ FLASHABLE_ZIP_NAME="$("${CUSTOM_BUSYBOX}" basename "${FLASHABLE_ZIP_PATH}")" ||
 chmod +x "${TMPDIR}/update-binary" || fail_with_msg "chmod failed on '${TMPDIR}/update-binary'"
 
 # Execute the script that will run the flashable zip
+recovery_flash_start "${SECONDARY_STORAGE}/${FLASHABLE_ZIP_NAME}" 1>&"${recovery_fd}"
 set +e
-"${CUSTOM_BUSYBOX}" ash "${TMPDIR}/updater" 3 "${recovery_fd}" "${SECONDARY_STORAGE}/${FLASHABLE_ZIP_NAME}" | TZ=UTC ts '[%H:%M:%S]'; STATUS="$?"
+"${CUSTOM_BUSYBOX}" ash "${TMPDIR}/updater" 3 "${recovery_fd}" "${SECONDARY_STORAGE}/${FLASHABLE_ZIP_NAME}" 1>>"${recovery_logs_dir}/recovery-stdout-stderr.log" 2>&1; STATUS="${?}"
 set -e
+recovery_flash_end "${STATUS}" "${SECONDARY_STORAGE}/${FLASHABLE_ZIP_NAME}" 1>&"${recovery_fd}"
 
 # Close recovery output
 # shellcheck disable=SC3023
 exec 99>&-
 if test "${uname_o_saved}" != 'MS/Windows'; then
-  sudo chattr -a "${THIS_SCRIPT_DIR}/output/recovery-output.log" || fail_with_msg "chattr failed on 'recovery-output.log'"
+  sudo chattr -a "${recovery_logs_dir}/recovery-output-raw.log" || fail_with_msg "chattr failed on 'recovery-output-raw.log'"
 fi
 
 # Parse recovery output
@@ -152,15 +191,17 @@ while IFS=' ' read -r ui_command text; do
       echo "${text}"
       last_msg_printed=true
     fi
+  elif test "${ui_command}" = 'custom_std'; then
+    echo "${text}"
   else
-    echo "> COMMAND: ${ui_command} ${text}"
+    echo "> ${ui_command} ${text}"
     last_msg_printed=false
   fi
-done < "${THIS_SCRIPT_DIR}/output/recovery-output.log" > "${THIS_SCRIPT_DIR}/output/recovery-output-parsed.log"
+done < "${recovery_logs_dir}/recovery-output-raw.log" > "${recovery_logs_dir}/recovery-output.log"
 
 # Final cleanup
 cd "${INIT_DIR}" || fail_with_msg 'Failed to change back the folder'
 unset TMPDIR
 rm -rf -- "${OUR_TEMP_DIR:?}" &
 set +e
-if test "${STATUS}" -ne 0; then fail_with_msg "Installation failed with error ${STATUS}"; fi
+if test "${STATUS}" -ne 0; then exit "${STATUS}"; fi

recovery-simulator/updater.sh

@@ -35,4 +35,4 @@ unset OVERRIDE_DIR
 export TEST_INSTALL=true
 
 # shellcheck source=SCRIPTDIR/../zip-content/META-INF/com/google/android/update-binary.sh
-. "${TMPDIR}/update-binary" || exit 124
+. "${TMPDIR}/update-binary" || exit "${?}"

zip-content/uninstall.sh

@@ -136,7 +136,8 @@ done
 delete_recursive "${SYS_PATH}"/etc/default-permissions/google-sync-permissions.xml
 delete_recursive "${SYS_PATH}"/etc/default-permissions/contacts-calendar-sync.xml
 
+if test -e "${SYS_PATH}/etc/zips"; then rmdir --ignore-fail-on-non-empty -- "${SYS_PATH}/etc/zips"; fi
+
 if [[ -z "${INSTALLER}" ]]; then
-  rmdir --ignore-fail-on-non-empty -- "${SYS_PATH}/etc/zips"
   ui_debug 'Done.'
 fi