From 9d8c098f74c575d12da7faab65f30fcad7f986c4 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 13 Dec 2023 21:08:12 +0100
Subject: [PATCH] gitlab-ci: add shellcheck to gradlew-fdroid checks

---
 .gitlab-ci.yml | 5 +++--
 gradlew-fdroid | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 21be7ba4..51ac0ec4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -180,7 +180,7 @@ arch_pip_install:
 # The gradlew-fdroid tests are isolated from the rest of the test
 # suite, so they run as their own job.
 gradlew-fdroid:
-  image: debian:bullseye
+  image: debian:bullseye-slim
   <<: *apt-template
   only:
     changes:
@@ -188,7 +188,8 @@ gradlew-fdroid:
       - gradlew-fdroid
       - tests/test-gradlew-fdroid
   script:
-    - apt-get install ca-certificates curl default-jdk-headless unzip
+    - apt-get install ca-certificates curl default-jdk-headless shellcheck unzip
+    - shellcheck --severity=error --color gradlew-fdroid tests/test-gradlew-fdroid
     - ./tests/test-gradlew-fdroid
 
 
diff --git a/gradlew-fdroid b/gradlew-fdroid
index 112fbd71..0de9dd04 100755
--- a/gradlew-fdroid
+++ b/gradlew-fdroid
@@ -20,6 +20,7 @@ run_gradle() {
     if [ ! -d "${gradle_version_dir}/${v_found}" ]; then
         download_gradle ${v_found}
     fi
+    # shellcheck disable=SC2145
     echo "Running ${gradle_version_dir}/${v_found}/bin/gradle ${args[@]}"
     "${gradle_version_dir}/${v_found}/bin/gradle" "${args[@]}"
     exit $?
@@ -264,7 +265,7 @@ fi
 if [[ -n $plugin_pver ]]; then
     i=0
     match=false
-    for k in ${d_gradle_plugin_ver_k[@]}; do
+    for k in "${d_gradle_plugin_ver_k[@]}"; do
         if [[ $plugin_pver == ${k}* ]]; then
             plugin_ver=${d_plugin_min_gradle_v[$i]}
             match=true