[mapguide-commits] r9729 - trunk/MgDev

[svn_mapguide at osgeo.org]

Author: jng
Date: 2020-09-14 08:33:38 -0700 (Mon, 14 Sep 2020)
New Revision: 9729

Modified:
   trunk/MgDev/cmake_package.sh
Log:
#2821: Unconditionally remove temp dirs before building a deb package

Modified: trunk/MgDev/cmake_package.sh
===================================================================
--- trunk/MgDev/cmake_package.sh	2020-09-10 18:32:13 UTC (rev 9728)
+++ trunk/MgDev/cmake_package.sh	2020-09-14 15:33:38 UTC (rev 9729)
@@ -201,17 +201,17 @@
 
     # Create output directory structure and ignore errors
     #
-    if [ ! -d tmp ]; then
-        mkdir -p "$WORKING_DIR/tmp"
-        mkdir -p "$WORKING_DIR/bin"
-        mkdir -p "$WORKING_DIR/debian"
-    else
-        # clean out existing build tree
-        rm -rf "$WORKING_DIR/tmp/*"
-        rm -rf "$WORKING_DIR/bin/*"
-        rm -rf "$WORKING_DIR/debian/*"
-    fi
+    echo "Setup working dir for deb package"
+    mkdir -p "${WORKING_DIR:?}/tmp"
+    mkdir -p "${WORKING_DIR:?}/bin"
+    mkdir -p "${WORKING_DIR:?}/debian"
 
+    # clean out existing build tree
+    echo "Clear out working dir"
+    rm -rf ${WORKING_DIR}/tmp/*
+    rm -rf ${WORKING_DIR}/bin/*
+    rm -rf ${WORKING_DIR}/debian/*
+
     # Blow away old build directory
     rm -rf ${DPKG_ROOT}