From 2afd8efa9d99bfa82a47de2f9a8c7dfad14aa4a2 Mon Sep 17 00:00:00 2001
From: Steven Noonan <steven@valvesoftware.com>
Date: Thu, 3 Sep 2020 17:56:33 -0700
Subject: [PATCH] travis: add generic install.sh to find image-appropriate
 script

Makes it easier to add images with weird characters in them, e.g.
"opensuse/tumbleweed:latest" would end up giving the wrong path with the
old config.

Signed-off-by: Steven Noonan <steven@valvesoftware.com>
---
 .travis.yml        |  2 +-
 .travis/install.sh | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100755 .travis/install.sh

diff --git a/.travis.yml b/.travis.yml
index f31c7ec..1634ae5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,7 +43,7 @@ before_install:
   - docker exec -e TRAVIS_BUILD=1 -e IMAGE=$IMAGE -e IMAGE_TAG=$IMAGE_TAG -t $CONTAINER_NAME sh .travis/preinstall.sh
 
 install:
-  - docker exec -e TRAVIS_BUILD=1 -e IMAGE=$IMAGE -e IMAGE_TAG=$IMAGE_TAG -t $CONTAINER_NAME bash .travis/install-$IMAGE.sh
+  - docker exec -e TRAVIS_BUILD=1 -e IMAGE=$IMAGE -e IMAGE_TAG=$IMAGE_TAG -t $CONTAINER_NAME bash .travis/install.sh
   - docker exec -e TRAVIS_BUILD=1 -e IMAGE=$IMAGE -e IMAGE_TAG=$IMAGE_TAG -t $CONTAINER_NAME bash .travis/install-post.sh
 
 script:
diff --git a/.travis/install.sh b/.travis/install.sh
new file mode 100755
index 0000000..eadf378
--- /dev/null
+++ b/.travis/install.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+INSTALL_SCRIPT_CANDIDATES=(
+	"$PWD/.travis/install-${IMAGE//\//-}.sh"
+	"$PWD/.travis/install-${IMAGE%/*}.sh"
+)
+
+for INSTALL_SCRIPT in "${INSTALL_SCRIPT_CANDIDATES[@]}"; do
+	if [[ -f "${INSTALL_SCRIPT}" ]]; then
+		bash "${INSTALL_SCRIPT}"
+		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