From: Magnus Jacobsson <magnus.jacobsson@berotec.se>
Date: Wed, 30 Sep 2020 14:51:33 +0000 (+0200)
Subject: Refactor ci/build.sh by moving definitions
X-Git-Tag: 2.46.0~20^2^2~53^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c898992ec9e479966448ed87b84d7ea84e0021d2;p=graphviz

Refactor ci/build.sh by moving definitions
---

diff --git a/ci/build.sh b/ci/build.sh
index abe2df4f7..1c520134a 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -16,6 +16,11 @@ GV_VERSION=$( cat VERSION )
 COLLECTION=$( cat COLLECTION )
 META_DATA_DIR=Metadata/${COLLECTION}/${ID}/${VERSION_ID}
 mkdir -p ${META_DATA_DIR}
+DIR=Packages/${COLLECTION}/${ID}/${VERSION_ID}
+ARCH=$( uname -m )
+mkdir -p ${DIR}/os/${ARCH}
+mkdir -p ${DIR}/debug/${ARCH}
+mkdir -p ${DIR}/source
 if [ "${build_system}" = "cmake" ]; then
     mkdir build
     cd build
@@ -32,11 +37,6 @@ else
         rpmbuild -ta graphviz-${GV_VERSION}.tar.gz | tee >(ci/extract-configure-log.sh >${META_DATA_DIR}/configure.log)
     fi
 fi
-DIR=Packages/${COLLECTION}/${ID}/${VERSION_ID}
-ARCH=$( uname -m )
-mkdir -p ${DIR}/os/${ARCH}
-mkdir -p ${DIR}/debug/${ARCH}
-mkdir -p ${DIR}/source
 if [ "${build_system}" = "cmake" ]; then
     if [ "${ID_LIKE}" = "debian" ]; then
         mv build/*.deb ${DIR}/os/${ARCH}/