From: Magnus Jacobsson <magnus.jacobsson@berotec.se>
Date: Wed, 30 Sep 2020 14:56:05 +0000 (+0200)
Subject: Refactor ci/build.sh by merging if statement bodies
X-Git-Tag: 2.46.0~20^2^2~53^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d91a6bbf561e485fbd870f992d6b088324bc317;p=graphviz

Refactor ci/build.sh by merging if statement bodies
---

diff --git a/ci/build.sh b/ci/build.sh
index 1c520134a..211c2bcc8 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -28,24 +28,18 @@ if [ "${build_system}" = "cmake" ]; then
     cmake --build .
     cpack
     cd ..
-else
-    if [ "${ID_LIKE}" = "debian" ]; then
-        tar xfz graphviz-${GV_VERSION}.tar.gz
-        (cd graphviz-${GV_VERSION}; fakeroot make -f debian/rules binary) | tee >(ci/extract-configure-log.sh >${META_DATA_DIR}/configure.log)
-    else
-        rm -rf ${HOME}/rpmbuild
-        rpmbuild -ta graphviz-${GV_VERSION}.tar.gz | tee >(ci/extract-configure-log.sh >${META_DATA_DIR}/configure.log)
-    fi
-fi
-if [ "${build_system}" = "cmake" ]; then
     if [ "${ID_LIKE}" = "debian" ]; then
         mv build/*.deb ${DIR}/os/${ARCH}/
     fi
 else
     if [ "${ID_LIKE}" = "debian" ]; then
+        tar xfz graphviz-${GV_VERSION}.tar.gz
+        (cd graphviz-${GV_VERSION}; fakeroot make -f debian/rules binary) | tee >(ci/extract-configure-log.sh >${META_DATA_DIR}/configure.log)
         mv *.deb ${DIR}/os/${ARCH}/
         mv *.ddeb ${DIR}/debug/${ARCH}/
     else
+        rm -rf ${HOME}/rpmbuild
+        rpmbuild -ta graphviz-${GV_VERSION}.tar.gz | tee >(ci/extract-configure-log.sh >${META_DATA_DIR}/configure.log)
         mv ${HOME}/rpmbuild/SRPMS/*.src.rpm ${DIR}/source/
         mv ${HOME}/rpmbuild/RPMS/*/*debuginfo*rpm ${DIR}/debug/${ARCH}/
         mv ${HOME}/rpmbuild/RPMS/*/*.rpm ${DIR}/os/${ARCH}/