github/install.sh: prevent output pollution from package installs

Signed-off-by: Steven Noonan <[email protected]>

Author: tycho

.github/install-fedora.sh

@@ -3,7 +3,6 @@
 # This is an install script for Fedora-specific packages.
 #
 set -ex
-set -o pipefail
 
 # Base build packages
 PACKAGES=(
@@ -24,8 +23,8 @@ if ! grep '^fastestmirror' /etc/dnf/dnf.conf; then
 	echo 'fastestmirror=1' >> /etc/dnf/dnf.conf
 fi
 
-dnf clean all | cat
-dnf update -y | cat
-dnf install -y "${PACKAGES[@]}" | cat
+dnf clean all
+dnf update -y
+dnf install -y "${PACKAGES[@]}"
 
 exit 0

.github/install.sh

@@ -1,2 +1,25 @@
 #!/bin/bash
-. .github/install-${IMAGE//\//-}.sh
+
+set -e
+set -o pipefail
+
+INSTALL_SCRIPT_CANDIDATES=(
+	"$PWD/.github/install-${IMAGE//\//-}.sh"
+	"$PWD/.github/install-${IMAGE%/*}.sh"
+)
+
+for INSTALL_SCRIPT in "${INSTALL_SCRIPT_CANDIDATES[@]}"; do
+	if [[ -f "${INSTALL_SCRIPT}" ]]; then
+		bash "${INSTALL_SCRIPT}" | cat
+		exit $?
+	fi
+done
+
+echo "Could not find install script in any of these paths:"
+for INSTALL_SCRIPT in "${INSTALL_SCRIPT_CANDIDATES[@]}"; do
+	echo "   ${INSTALL_SCRIPT}"
+done
+echo ""
+echo "Don't know how to install packages for ${IMAGE}!"
+echo ""
+exit 1