Sync with microG unofficial installer

Author: ale5000-git

.github/workflows/auto-nightly.yml

@@ -80,19 +80,20 @@ jobs:
           ZIP_IS_ALPHA='${{ steps.build.outputs.ZIP_IS_ALPHA }}'
           ZIP_BUILD_TYPE='${{ steps.build.outputs.ZIP_BUILD_TYPE }}'
           ZIP_BUILD_TYPE_SUPPORTED='${{ steps.build.outputs.ZIP_BUILD_TYPE_SUPPORTED }}'
+          ZIP_BRANCH_NAME='${{ steps.build.outputs.ZIP_BRANCH_NAME }}'
           ZIP_MD5='${{ steps.build.outputs.ZIP_MD5 }}'
           ZIP_SHA256='${{ steps.build.outputs.ZIP_SHA256 }}'
           ZIP_ATTESTATION_URL='${{ steps.attest.outputs.attestation-url }}'
           # Displaying informations...
           printf '%s\n' "::notice::Filename: ${ZIP_FILENAME:-Missing}"
           printf '%s\n' "::notice::Version: ${ZIP_VERSION:?} - Short commit ID: ${ZIP_SHORT_COMMIT_ID:?} - Is alpha: ${ZIP_IS_ALPHA:?} - Build type: ${ZIP_BUILD_TYPE:?}"
+          printf '%s\n' "::notice::Build type supported: ${ZIP_BUILD_TYPE_SUPPORTED:?}"
           if '${{ github.ref_name && github.ref_name != github.event.repository.default_branch }}'; then
             ZIP_RETENTION_DAYS=30
             printf '%s\n' '::notice::Branch: ${{ github.ref_name }}'
           else
             ZIP_RETENTION_DAYS=10
           fi
-          printf '%s\n' "::notice::Build type supported: ${ZIP_BUILD_TYPE_SUPPORTED:?}"
           printf '%s\n' "::notice::MD5: ${ZIP_MD5:-Missing}"
           printf '%s\n' "::notice::SHA-256: ${ZIP_SHA256:-Missing}"
           printf '%s\n' "::notice::Logs retention days: ${{ github.retention_days }}"
@@ -232,7 +233,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: "${{ steps.build.outputs.ZIP_BUILD_TYPE_SUPPORTED == 'true' }}"
         with:
-          name: "${{ github.event.repository.name }} ${{ github.ref_name }} g${{ steps.build.outputs.ZIP_SHORT_COMMIT_ID }} ${{ steps.build.outputs.ZIP_BUILD_TYPE }} (extract it)"
+          name: "${{ github.event.repository.name }} ${{ steps.build.outputs.ZIP_BRANCH_NAME || github.ref_name }} g${{ steps.build.outputs.ZIP_SHORT_COMMIT_ID }} ${{ steps.build.outputs.ZIP_BUILD_TYPE }} (extract it)"
           path: "${{ steps.build.outputs.ZIP_FOLDER }}/*.zip*"
           overwrite: false
           retention-days: "${{ steps.info.outputs.ZIP_RETENTION_DAYS }}"

build.sh

@@ -142,6 +142,7 @@ if test "${OPENSOURCE_ONLY:?}" != 'false'; then
         printf 'ZIP_SHORT_COMMIT_ID=%s\n' "${ZIP_SHORT_COMMIT_ID?}"
         printf 'ZIP_BUILD_TYPE=%s\n' "${BUILD_TYPE?}"
         printf 'ZIP_BUILD_TYPE_SUPPORTED=%s\n' 'false'
+        printf 'ZIP_BRANCH_NAME=\n'
         printf 'ZIP_IS_ALPHA=%s\n' "${MODULE_IS_ALPHA?}"
         printf 'ZIP_SHA256=\n'
         printf 'ZIP_MD5=\n'
@@ -176,6 +177,13 @@ if test -z "${TEMP_DIR}"; then ui_error 'Failed to create our temp dir'; fi
 rm -rf "${TEMP_DIR:?}"/* || ui_error 'Failed to empty our temp dir'
 
 # Set filename
+sanitize_filename_part()
+{
+  # The "-" character must be replaced because it is used to separate the various parts of the filename
+  printf '%s' "${1:?}" | tr -- '-\\/:*?"<>|\r\n\0' '_' || ui_error 'Failed to sanitize filename part'
+}
+
+BRANCH_NAME=''
 FILENAME_COMMIT_ID="g${ZIP_SHORT_COMMIT_ID?}"
 test "${FILENAME_COMMIT_ID:?}" != 'g' || FILENAME_COMMIT_ID='NOGIT'
 FILENAME_START="${MODULE_ID:?}-${MODULE_VER:?}-"
@@ -184,18 +192,18 @@ FILENAME_END="-${BUILD_TYPE:?}-by-${MODULE_AUTHOR:?}"
 
 if test "${CI:-false}" != 'false'; then
   if test -n "${CI_COMMIT_BRANCH-}" && test "${CI_COMMIT_BRANCH:?}" != "${CI_DEFAULT_BRANCH:-unknown}"; then
-    FILENAME_MIDDLE="${CI_COMMIT_BRANCH:?}-${FILENAME_MIDDLE:?}" # GitLab
-  fi
-  if test "${GITHUB_REF_TYPE-}" = 'branch' && test -n "${GITHUB_REF_NAME-}" && test "${GITHUB_REF_NAME:?}" != "${GITHUB_REPOSITORY_DEFAULT_BRANCH:-main}"; then
-    FILENAME_MIDDLE="${GITHUB_REF_NAME:?}-${FILENAME_MIDDLE:?}" # GitHub
+    BRANCH_NAME="$(sanitize_filename_part "${CI_COMMIT_BRANCH:?}" || :)" # GitLab
+  elif test "${GITHUB_REF_TYPE-}" = 'branch' && test -n "${GITHUB_REF_NAME-}" && test "${GITHUB_REF_NAME:?}" != "${GITHUB_REPOSITORY_DEFAULT_BRANCH:-main}"; then
+    BRANCH_NAME="$(sanitize_filename_part "${GITHUB_REF_NAME:?}" || :)" # GitHub
   fi
+  test -z "${BRANCH_NAME?}" || FILENAME_MIDDLE="${BRANCH_NAME:?}-${FILENAME_MIDDLE:?}"
   if test "${CI_PROJECT_NAMESPACE:-${GITHUB_REPOSITORY_OWNER:-unknown}}" != 'micro''5k'; then
     FILENAME_MIDDLE="fork-${FILENAME_MIDDLE:?}" # GitLab / GitHub
   fi
 else
-  branch_name="$(git 2> /dev/null branch --show-current)" || branch_name="$(git 2> /dev/null rev-parse --abbrev-ref HEAD)" || branch_name=''
-  if test -n "${branch_name?}" && test "${branch_name:?}" != 'main' && test "${branch_name:?}" != 'master' && test "${branch_name:?}" != 'HEAD'; then
-    FILENAME_MIDDLE="${branch_name:?}-${FILENAME_MIDDLE:?}"
+  BRANCH_NAME="$(git 2> /dev/null branch --show-current)" || BRANCH_NAME="$(git 2> /dev/null rev-parse --abbrev-ref HEAD)" || BRANCH_NAME=''
+  if test -n "${BRANCH_NAME?}" && test "${BRANCH_NAME:?}" != 'main' && test "${BRANCH_NAME:?}" != 'HEAD'; then
+    FILENAME_MIDDLE="$(sanitize_filename_part "${BRANCH_NAME:?}" || :)-${FILENAME_MIDDLE:?}"
   fi
 fi
 
@@ -369,6 +377,7 @@ if test "${GITHUB_JOB:-false}" != 'false'; then
     printf 'ZIP_SHORT_COMMIT_ID=%s\n' "${ZIP_SHORT_COMMIT_ID?}"
     printf 'ZIP_BUILD_TYPE=%s\n' "${BUILD_TYPE?}"
     printf 'ZIP_BUILD_TYPE_SUPPORTED=%s\n' 'true'
+    printf 'ZIP_BRANCH_NAME=%s\n' "${BRANCH_NAME?}"
     printf 'ZIP_IS_ALPHA=%s\n' "${MODULE_IS_ALPHA?}"
     printf 'ZIP_SHA256=%s\n' "${ZIP_SHA256?}"
     printf 'ZIP_MD5=%s\n' "${ZIP_MD5?}"