From 82241e17522fb78a2d90ea96e56a05049eeca702 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Mon, 17 Sep 2018 13:08:01 +0000 Subject: [PATCH] support opensuse tumbleweed --- INSTALL | 2 +- build-in-docker.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/INSTALL b/INSTALL index 8b641e3..ddcdb76 120000 --- a/INSTALL +++ b/INSTALL @@ -1 +1 @@ -/usr/share/automake-1.13/INSTALL \ No newline at end of file +/usr/share/automake-1.15/INSTALL \ No newline at end of file diff --git a/build-in-docker.sh b/build-in-docker.sh index b544b47..f7355ab 100755 --- a/build-in-docker.sh +++ b/build-in-docker.sh @@ -307,7 +307,7 @@ gpgcheck=0 EOF fi INSTALL_TOOL=$((docker exec ${DOCKER_ID} test -x /usr/bin/zypper && echo zypper install -y) || (docker exec ${DOCKER_ID} test -x /usr/bin/dnf && echo dnf install -y) || (docker exec ${DOCKER_ID} test -x /usr/bin/yum && echo yum install -y) || (docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo urpmi --auto)) - if test "$INSTALL_TOOL" = "urpmi --auto"; then + if test "$INSTALL_TOOL" = "urpmi --auto" -o "$INSTALL_TOOL" = "zypper install -y"; then LSB_RELEASE=lsb-release else LSB_RELEASE=/usr/bin/lsb_release