]> granicus.if.org Git - graphviz/commitdiff
Refactor ci/build.sh by merging if statement bodies
authorMagnus Jacobsson <magnus.jacobsson@berotec.se>
Wed, 30 Sep 2020 14:56:05 +0000 (16:56 +0200)
committerMagnus Jacobsson <magnus.jacobsson@berotec.se>
Sun, 4 Oct 2020 07:58:14 +0000 (09:58 +0200)
ci/build.sh

index 1c520134a0179346cbce058f21e3541ca0466e44..211c2bcc869d93be13a820edc55f1ed3d2d2a78e 100755 (executable)
@@ -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}/