feat: harden scripts

.ci-scripts/enforce-formula-policies.sh

@@ -13,9 +13,9 @@ yq --version >/dev/null || {
 }
 
 echo "Remove over-specific versions:"
-for formulaVersionsFile in "$TAP_GEN_TMP_PATH"/*.yaml; do
+while read -r formulaVersionsFile; do
     fName=$(basename "${formulaVersionsFile%.yaml}")
-    echo "- $fName ($(yq 'length' "$formulaVersionsFile") versions found)"
+    echo "- $fName ($(yq 'length' "$formulaVersionsFile") versions)"
 
     # Remove over-specific formula
     while read -r fVersion; do
@@ -24,4 +24,4 @@ for formulaVersionsFile in "$TAP_GEN_TMP_PATH"/*.yaml; do
       echo "  - Removing $fFilename"
       rm -f "Formula/$fFilename"
     done < <(yq -e -oj -I0 '.[] | select(.bugfix != "" or .buildtag != "")' <"$formulaVersionsFile" 2>/dev/null)
-done
+done < <(find "$TAP_GEN_TMP_PATH" -maxdepth 1 -type f -name '*.yaml')

.ci-scripts/generate-aliases.sh

@@ -40,7 +40,7 @@ echo "Delete symlinks in Aliases folder"
 rm -f Aliases/*.rb
 
 echo "Generating Aliases from provided config:"
-for formulaVersionsFile in "$TAP_GEN_TMP_PATH"/*.yaml; do
+while read -r formulaVersionsFile; do
     fName=$(basename "${formulaVersionsFile%.yaml}")
     echo "- $fName ($(yq 'length' "$formulaVersionsFile") versions found)"
 
@@ -100,7 +100,7 @@ for formulaVersionsFile in "$TAP_GEN_TMP_PATH"/*.yaml; do
         echo "    - Skipping $symlinkName for $symlinkTarget => Formula exists"
       fi
     done < <(yq -e -ot -I0 '[.[] | .major] | unique | sort | .[]' <"$formulaVersionsFile")
-done
+done < <(find "$TAP_GEN_TMP_PATH" -maxdepth 1 -type f -name '*.yaml')
 
 aliasesCountAfter=$( (ls -1 Aliases/*.rb 2>/dev/null || true) | wc -l | tr -d ' ')
 echo "Found $aliasesCountAfter aliases afterwards -- a change of $((aliasesCountAfter - aliasesCountBefore))"

.ci-scripts/install-packages.sh

@@ -4,7 +4,7 @@ set -euo pipefail
 # Enable debug - print commands
 #set -x
 
-aptGetInstallPackages=(wget)
+aptGetInstallPackages=(git wget)
 
 # Detect environment
 if [[ -n "${GITLAB_CI:-}" ]]; then
@@ -19,16 +19,16 @@ else
 fi
 
 # Install needed packages
-echo "Installing packages with apt: ${aptGetInstallPackages[*]}"
+echo "Installing ${#aptGetInstallPackages[*]} packages with apt: ${aptGetInstallPackages[*]}"
 # Install apt requirements
 if [[ "$runnerType" == "gitlab" ]]; then
   echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
   apt-get update
-  apt-get -qy install "${aptGetInstallPackages[*]}"
+  apt-get -qy install "${aptGetInstallPackages[@]}"
 elif [[ "$runnerType" == "github" ]]; then
   echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections
   sudo apt-get -q update
-  sudo apt-get -qy install "${aptGetInstallPackages[*]}"
+  sudo apt-get -qy install "${aptGetInstallPackages[@]}"
 fi
 
 # Install yq

.ci-scripts/parse-formulas.sh

@@ -7,14 +7,14 @@ set -euo pipefail
 TAP_GEN_TMP_PATH=".parsed-formula"
 
 if [[ -d "$TAP_GEN_TMP_PATH" ]]; then
-    echo "$TAP_GEN_TMP_PATH already exists, deleting! => Should happen only locally..."
+    echo "$TAP_GEN_TMP_PATH already exists, deleting!"
     rm -rf "$TAP_GEN_TMP_PATH"
 fi
 
 mkdir "$TAP_GEN_TMP_PATH"
 
 echo "Sort Formula:"
-for formulaFile in Formula/*.rb; do
+while read -r formulaFile; do
     formulaFile=$(basename "$formulaFile")
 
     if [[ "$formulaFile" =~ ^\. ]]; then
@@ -46,10 +46,10 @@ for formulaFile in Formula/*.rb; do
   buildtag: '$fBuildtag'
   filename: '$formulaFile'
 EOF
-done
+done < <(find Formula -maxdepth 1 -type f -name '*.rb')
 
 echo "Config files wrote to $TAP_GEN_TMP_PATH:"
 (
     cd "$TAP_GEN_TMP_PATH"
-    ls -a1 ./*.yaml
+    ls -a1 ./*.yaml || echo "No config files written..."
 ) || true

.ci-scripts/update-toc.sh

@@ -11,7 +11,7 @@ function generateToc() {
     formulaName=${file//.yaml/}
     1>&2 echo "  - $formulaName"
     printf -- "* %s\n" "$formulaName"
-  done < <(find "$TAP_GEN_TMP_PATH" -maxdepth 1 -type f -regex '.*\.yaml' -exec basename {} \; | sort)
+  done < <(find "$TAP_GEN_TMP_PATH" -maxdepth 1 -type f -name '*.yaml' -exec basename {} \; | sort)
 }
 
 echo "Generating TOC in README.md"