From c8790bfbbb845450608adc7a0a03b77979165f42 Mon Sep 17 00:00:00 2001
From: Valentin Rothberg <rothberg@redhat.com>
Date: Wed, 10 Nov 2021 17:08:57 +0100
Subject: cirrus: force-install catatonit

A temporary workaround until the CI images are updated.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
---
 hack/install_catatonit.sh | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

(limited to 'hack')

diff --git a/hack/install_catatonit.sh b/hack/install_catatonit.sh
index 0a02b75ab..a35e349f5 100755
--- a/hack/install_catatonit.sh
+++ b/hack/install_catatonit.sh
@@ -4,22 +4,23 @@ CATATONIT_PATH="${BASE_PATH}/catatonit"
 CATATONIT_VERSION="v0.1.7"
 set -e
 
-if [ -f $CATATONIT_PATH ]; then
+if [ -f $CATATONIT_PATH ] && [ -z "$1" ]; then
 	echo "skipping ... catatonit is already installed"
-else
-	echo "installing catatonit to $CATATONIT_PATH"
-	buildDir=$(mktemp -d)
-	git clone https://github.com/openSUSE/catatonit.git $buildDir
+	exit 0
+fi
 
-	pushd $buildDir
-	echo `pwd`
-	git reset --hard ${CATATONIT_VERSION}
-	autoreconf -fi
-	./configure
-	make
-	install ${SELINUXOPT} -d -m 755 $BASE_PATH
-	install ${SELINUXOPT} -m 755 catatonit $CATATONIT_PATH
-	popd
+echo "installing catatonit to $CATATONIT_PATH"
+buildDir=$(mktemp -d)
+git clone https://github.com/openSUSE/catatonit.git $buildDir
 
-	rm -rf $buildDir
-fi
+pushd $buildDir
+echo `pwd`
+git reset --hard ${CATATONIT_VERSION}
+autoreconf -fi
+./configure
+make
+install ${SELINUXOPT} -d -m 755 $BASE_PATH
+install ${SELINUXOPT} -m 755 catatonit $CATATONIT_PATH
+popd
+
+rm -rf $buildDir
-- 
cgit v1.2.3-54-g00ecf