From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Mon, 9 Nov 2020 10:06:14 +0000 (+0100)
Subject: tools/ci-build.sh: Clean up directories from possible previous builds
X-Git-Tag: dbus-1.12.22~4^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83d203d460c49d4d7f3d571f70751c071f4f2103;p=thirdparty%2Fdbus.git

tools/ci-build.sh: Clean up directories from possible previous builds

Otherwise, ci-build.sh cannot be executed on a local system if there
are previous runs.

(cherry picked from commit e82d5fe48623337fd5a69317e27b7a8ce195398a)
---

diff --git a/tools/ci-build.sh b/tools/ci-build.sh
index e92d85b38..1db4edf65 100755
--- a/tools/ci-build.sh
+++ b/tools/ci-build.sh
@@ -100,10 +100,12 @@ NOCONFIGURE=1 ./autogen.sh
 
 case "$ci_buildsys" in
     (cmake-dist)
+        # clean up directories from possible previous builds
+        rm -rf ci-build-dist
         # Do an Autotools `make dist`, then build *that* with CMake,
         # to assert that our official release tarballs will be enough
         # to build with CMake.
-        mkdir ci-build-dist
+        mkdir -p ci-build-dist
         ( cd ci-build-dist; ../configure )
         make -C ci-build-dist dist
         tar -zxvf ci-build-dist/dbus-1.*.tar.gz
@@ -131,7 +133,9 @@ case "$ci_host" in
 esac
 
 srcdir="$(pwd)"
-mkdir ci-build-${ci_variant}-${ci_host}
+# clean up directories from possible previous builds
+rm -rf ci-build-${ci_variant}-${ci_host}
+mkdir -p ci-build-${ci_variant}-${ci_host}
 cd ci-build-${ci_variant}-${ci_host}
 
 make="make -j${ci_parallel} V=1 VERBOSE=1"