From 8090e269c68273936cf2123673f26eda95f2cce9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Tue, 11 Sep 2018 10:21:16 +0000
Subject: [PATCH] fix installation check after package build

---
 COPYING            |  2 +-
 INSTALL            |  2 +-
 build-in-docker.sh | 11 ++++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/COPYING b/COPYING
index 88798ab..2fcb217 120000
--- a/COPYING
+++ b/COPYING
@@ -1 +1 @@
-/usr/share/automake-1.15/COPYING
\ No newline at end of file
+/usr/share/automake-1.13/COPYING
\ No newline at end of file
diff --git a/INSTALL b/INSTALL
index ddcdb76..8b641e3 120000
--- a/INSTALL
+++ b/INSTALL
@@ -1 +1 @@
-/usr/share/automake-1.15/INSTALL
\ No newline at end of file
+/usr/share/automake-1.13/INSTALL
\ No newline at end of file
diff --git a/build-in-docker.sh b/build-in-docker.sh
index 182fb75..b544b47 100755
--- a/build-in-docker.sh
+++ b/build-in-docker.sh
@@ -344,12 +344,13 @@ done
 docker exec -u $(id -u):$(id -g) ${DOCKER_ID} ./bootstrap.sh -t "${targets}" ${host} "${FLAGS[@]}"
 
 # last check: try to install built deb or rpm files (if not already cleaned up)
-if test "${targets//deb/}" != "${targets}"; then
-    if ls *.deb > /dev/null 2> /dev/null; then
-        docker exec ${DOCKER_ID} bash -c "apt-get install ${OPTIONS} ${PREVENT} /workdir/*.deb"
-    fi
+# not supported in trusty and jessie
+if test "$mode" = deb -a "${img//trusty/}" = "${img}" -a "${img//jessie/}" = "${img}"; then
+   if test "${targets//deb/}" != "${targets}" && ls *.deb > /dev/null 2> /dev/null; then
+       docker exec ${DOCKER_ID} bash -c "apt-get install ${OPTIONS} ${PREVENT} /workdir/*.deb"
+   fi
 fi
-if test "${targets//rpm/}" != "${targets}"; then
+if test "$mode" = rpm -a "${targets//rpm/}" != "${targets}"; then
     if ls *.rpm > /dev/null 2> /dev/null; then
         docker exec ${DOCKER_ID} bash -c "${INSTALL_TOOL} /workdir/*.rpm"
     fi