chore: sync with microG unofficial installer

Signed-off-by: ale5000 <15793015+ale5000-git@users.noreply.github.com>

Author: ale5000-git

.github/workflows/coverage.yml

@@ -43,12 +43,6 @@ jobs:
         with:
           ruby-version: "3.4"
           bundler-cache: "true"
-      - name: "Install Bashcov and simplecov-lcov"
-        shell: bash
-        timeout-minutes: 10
-        run: |
-          # Installing Bashcov and simplecov-lcov...
-          gem install bashcov:3.3.0 simplecov-lcov
       - name: "Use build cache"
         uses: actions/cache/restore@v5
         timeout-minutes: 5
@@ -73,7 +67,7 @@ jobs:
           # Executing code coverage...
           export BUILD_TYPE=oss
           #sudo apt-get -qq -y install moreutils 1>/dev/null
-          bashcov '${{ github.workspace }}/build.sh' # To timestamp the output pipe it to: TZ=UTC ts '[%H:%M:%S]'
+          bundle exec bashcov '${{ github.workspace }}/build.sh' # To timestamp the output pipe it to: TZ=UTC ts '[%H:%M:%S]'
       - name: "Testing (with coverage)"
         shell: bash
         timeout-minutes: 10
@@ -83,7 +77,7 @@ jobs:
           echo '==========================='
           echo 'TESTING OF ZIP INSTALLATION'
           echo '==========================='
-          bashcov '${{ github.workspace }}/recovery-simulator/recovery.sh' '${{ steps.build.outputs.ZIP_FOLDER }}/${{ steps.build.outputs.ZIP_FILENAME }}'
+          bundle exec bashcov '${{ github.workspace }}/recovery-simulator/recovery.sh' '${{ steps.build.outputs.ZIP_FOLDER }}/${{ steps.build.outputs.ZIP_FILENAME }}'
           printf '\n'
           echo '==============='
           echo 'RECOVERY OUTPUT'

.tool-versions

@@ -1,5 +1,4 @@
 # SPDX-FileCopyrightText: NONE
 # SPDX-License-Identifier: CC0-1.0
 
-java temurin-17
-gradle 8.11.1
+java latest:temurin-17 system

Makefile

@@ -1,31 +1,77 @@
 #!/usr/bin/env -S make -f
-
-# SPDX-FileCopyrightText: (c) 2024 ale5000
+# SPDX-FileCopyrightText: 2024 ale5000
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 .POSIX:
 
-all: buildota buildotaoss ;
+# --- Performance optimizations & global config ---
+# Disable the default inference rule for .sh files early to speed up parsing
+.sh:
+	@:
+
+# --- Configurations && shell commands ---
+GET_PROJECT_NAME = (git 2> /dev/null rev-parse --show-toplevel | xargs 2> /dev/null basename) || basename '$(CURDIR)'
+OUTPUT_DIR       = output
 
-.PHONY: all clean test check distcheck build
+REUSE_TOOL       = reuse
+
+# --- Target descriptions (for help logic) ---
+DESCRIPTION_TARGET_BUILDOTA    = 🚀 Build the flashable zip [Full edition]
+DESCRIPTION_TARGET_BUILDOTAOSS = 🚀 Build the flashable zip [OSS edition]
+DESCRIPTION_TARGET_INSTALLTEST = 🧪 Test the flashable zip in a simulated Android recovery environment on your PC
+DESCRIPTION_TARGET_CLEAN       = 🧹 Remove build artifacts
+DESCRIPTION_TARGET_REUSE_LINT  = ⚖️ Verify license and copyright compliance (REUSE)
+DESCRIPTION_TARGET_SPDX        = 📄 Generate the SBOM in SPDX format
+DESCRIPTION_TARGET_HELP        = ❓ Display this help
+
+# --- Primary targets ---
+.PHONY: all buildota buildotaoss installtest clean help
+
+all: buildota buildotaoss ;
 
 buildota:
-	BUILD_TYPE=full "$(CURDIR)/build.sh" --no-default-build-type --no-pause $(ARGS)
+	BUILD_TYPE=full '$(CURDIR)/build.sh' --no-default-build-type --no-pause $(ARGS)
 
 buildotaoss:
-	BUILD_TYPE=oss "$(CURDIR)/build.sh" --no-default-build-type --no-pause $(ARGS)
-build: buildotaoss ;
+	BUILD_TYPE=oss '$(CURDIR)/build.sh' --no-default-build-type --no-pause $(ARGS)
 
-test:
-	"$(CURDIR)/recovery-simulator/recovery.sh" "$(CURDIR)"/output/*.zip
-check: test ;
-distcheck: check ;
+installtest:
+	@'$(CURDIR)/recovery-simulator/recovery.sh' '$(CURDIR)'/output/*.zip
 
 clean:
-	rm -f "$(CURDIR)"/output/*.zip
-	rm -f "$(CURDIR)"/output/*.zip.md5
-	rm -f "$(CURDIR)"/output/*.zip.sha256
+	rm -f '$(CURDIR)'/output/*.zip
+	rm -f '$(CURDIR)'/output/*.zip.md5
+	rm -f '$(CURDIR)'/output/*.zip.sha256
 
-# Disable the default inference rule for .sh files
-.sh:
-	@:
+# --- Compliance targets ---
+.PHONY: reuse-lint spdx
+
+reuse-lint:
+	@echo 'Checking REUSE compliance...'
+	@'$(REUSE_TOOL)' lint
+
+spdx: reuse-lint
+	@echo ''
+	@PROJECT_NAME="$$( $(GET_PROJECT_NAME) )"; \
+	echo 'Generating SPDX SBOM at $(OUTPUT_DIR)/'"$${PROJECT_NAME:?}.spdx..."; \
+	'$(REUSE_TOOL)' spdx --creator-person ale5000 --add-license-concluded -o '$(CURDIR)/$(OUTPUT_DIR)/'"$${PROJECT_NAME:?}.spdx"
+	@echo 'Done.'
+
+# --- Aliases & compatibility ---
+.PHONY: build test check distcheck sbom
+build: buildotaoss ;
+test: installtest ;
+check: test ;
+distcheck: test ;
+sbom: spdx ;
+
+# --- Help system ---
+# Hide specific targets from the help list
+.hide: build test check distcheck sbom
+
+help:
+	@'$(MAKE)' 2>/dev/null -qnrp | awk \
+		'/^DESCRIPTION_TARGET_[A-Z0-9_]+[[:space:]]*=/ { k=tolower(substr($$1,20)); gsub(/_/,"-",k); desc[k]=substr($$0,index($$0,"=")+2) } \
+		/^\.hide:/ { n=split(substr($$0,7),a); for(i=1;i<=n;i++) hide[a[i]]=1 } \
+		/^[a-zA-Z_][a-zA-Z0-9_-]*:/{ t=substr($$0,1,index($$0,":")-1); if(tolower(t)!="makefile") tgt[t]=1 } \
+		END { n=0; for(t in tgt){ if(t in hide) continue; i=n; while(i>0&&keys[i]>t){ keys[i+1]=keys[i]; i-- }; keys[i+1]=t; n++ }; for(i=1;i<=n;i++){ if(keys[i] in desc) printf "%-15s %s\n",keys[i],desc[keys[i]]; else print keys[i] } }'

SECURITY.md

@@ -1,5 +1,5 @@
 <!--
-    SPDX-FileCopyrightText: (c) 2023 ale5000
+    SPDX-FileCopyrightText: 2023 ale5000
     SPDX-License-Identifier: GPL-3.0-or-later
     SPDX-FileType: DOCUMENTATION
 -->

build.bat

@@ -1,6 +1,5 @@
-@REM SPDX-FileCopyrightText: (c) 2016 ale5000
+@REM SPDX-FileCopyrightText: 2016 ale5000
 @REM SPDX-License-Identifier: GPL-3.0-or-later
-@REM SPDX-FileType: SOURCE
 
 @echo off
 SETLOCAL 2> nul

build.gradle

@@ -1,7 +1,6 @@
 // -*- coding: utf-8; mode: conf-javaprop -*-
-// SPDX-FileCopyrightText: (c) 2016 ale5000
+// SPDX-FileCopyrightText: 2016 ale5000
 // SPDX-License-Identifier: GPL-3.0-or-later
-// SPDX-FileType: SOURCE
 
 buildscript {
     apply from: 'dependencies.gradle'
@@ -43,7 +42,7 @@ private void initialize() {
     println 'OS: ' + System.properties['os.name']
 
     if(JavaVersion.current() < JavaVersion.VERSION_17) {
-        throw new GradleException('This require Java 17 or later')
+        throw new GradleException('Java 17 or later is required')
     }
 }
 
@@ -122,10 +121,10 @@ static String getScriptExt() {
 
 tasks.register('buildOta', Exec) {
     group = '- OTA build'
-    description = 'Build the flashable OTA zip.'
+    description = 'Build the flashable zip [Full edition].'
 
     doFirst {
-        println 'Building the flashable OTA zip with Gradle...'
+        println 'Building the flashable zip with Gradle...'
         environment BUILD_TYPE: 'full'
         environment NO_PAUSE: '1'
         executable "${projectDir}/build" + getScriptExt()
@@ -134,10 +133,10 @@ tasks.register('buildOta', Exec) {
 
 tasks.register('buildOtaOSS', Exec) {
     group = '- OTA build'
-    description = 'Build the flashable OTA zip (open-source components only).'
+    description = 'Build the flashable zip [OSS edition].'
 
     doFirst {
-        println 'Building the flashable OTA zip (open-source components only) with Gradle...'
+        println 'Building the flashable zip (open-source components only) with Gradle...'
         environment BUILD_TYPE: 'oss'
         environment NO_PAUSE: '1'
         executable "${projectDir}/build" + getScriptExt()
@@ -149,7 +148,7 @@ tasks.named('build').configure {
 
 tasks.register('installTest', Exec) {
     group = 'verification'
-    description = 'Emulate an Android recovery on your PC and run the flashable zip file inside it to see the result.'
+    description = 'Test the flashable zip in a simulated Android recovery environment on your PC.'
     mustRunAfter build, buildOta, buildOtaOSS
 
     doFirst {