From: Magnus Jacobsson <Magnus.Jacobsson@berotec.se>
Date: Sat, 4 Sep 2021 13:37:13 +0000 (+0200)
Subject: ci/build.sh: CMake: use OSTYPE to determine if on GNU/Linux
X-Git-Tag: 2.49.1~39^2~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=af869dc693057dcaf707924b56fcdb9f7cde3605;p=graphviz

ci/build.sh: CMake: use OSTYPE to determine if on GNU/Linux

OSTYPE is a built-in variable in bash and exists on all operating
systems.

As a second discriminator, use ID_LIKE to determine if on a Debian
like OS, e.g. Ubuntu.
---

diff --git a/ci/build.sh b/ci/build.sh
index 37eac218c..10c693252 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -31,15 +31,17 @@ if [ "${build_system}" = "cmake" ]; then
     cmake --build .
     cpack
     cd ..
-    if [ "${ID_LIKE}" = "debian" ]; then
-        mv build/*.deb ${DIR}/os/${ARCH}/
+    if [ "${OSTYPE}" = "linux-gnu" ]; then
+        if [ "${ID_LIKE:-}" = "debian" ]; then
+            mv build/*.deb ${DIR}/os/${ARCH}/
+        else
+            mv build/*.rpm ${DIR}/os/${ARCH}/
+        fi
     elif [[ "${OSTYPE}" =~ "darwin" ]]; then
         mv build/*.zip ${DIR}/os/${ARCH}/
     elif [ "${OSTYPE}" = "msys" ]; then
         mv build/*.zip ${DIR}/os/${ARCH}/
         mv build/*.exe ${DIR}/os/${ARCH}/
-    else
-        mv build/*.rpm ${DIR}/os/${ARCH}/
     fi
 else
     GV_VERSION=$( cat VERSION )