From: Magnus Jacobsson <Magnus.Jacobsson@berotec.se>
Date: Tue, 20 Oct 2020 13:42:18 +0000 (+0200)
Subject: Refactor ci/install.sh to check for build system before OS
X-Git-Tag: 2.46.0~20^2^2~15^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5d87eb6d29052e733be95d247f45de4af3c32ac1;p=graphviz

Refactor ci/install.sh to check for build system before OS
---

diff --git a/ci/install-packages.sh b/ci/install-packages.sh
index 8ef13ae97..c85a5295c 100755
--- a/ci/install-packages.sh
+++ b/ci/install-packages.sh
@@ -15,17 +15,17 @@ GV_VERSION=$( cat VERSION )
 COLLECTION=$( cat COLLECTION )
 DIR=Packages/${COLLECTION}/${ID}/${VERSION_ID}
 ARCH=$( uname -m )
-if [ "${ID_LIKE}" = "debian" ]; then
-    if [ "${build_system}" = "cmake" ]; then
+if [ "${build_system}" = "cmake" ]; then
+    if [ "${ID_LIKE}" = "debian" ]; then
         apt install ./${DIR}/os/${ARCH}/Graphviz-${GV_VERSION}-Linux.deb
     else
+        rpm --install --force ${DIR}/os/${ARCH}/Graphviz-${GV_VERSION}-Linux.rpm
+    fi
+else
+    if [ "${ID_LIKE}" = "debian" ]; then
         apt install ./${DIR}/os/${ARCH}/libgraphviz4_${GV_VERSION}-1_amd64.deb
         apt install ./${DIR}/os/${ARCH}/libgraphviz-dev_${GV_VERSION}-1_amd64.deb
         apt install ./${DIR}/os/${ARCH}/graphviz_${GV_VERSION}-1_amd64.deb
-    fi
-else
-    if [ "${build_system}" = "cmake" ]; then
-        rpm --install --force ${DIR}/os/${ARCH}/Graphviz-${GV_VERSION}-Linux.rpm
     else
         rpm --install --force \
             ${DIR}/os/${ARCH}/graphviz-${GV_VERSION}*.rpm \