[archiva] branch archiva-2.x updated: Fixing workspace prepare script

[martin_s]

This is an automated email from the ASF dual-hosted git repository.

martin_s pushed a commit to branch archiva-2.x
in repository https://gitbox.apache.org/repos/asf/archiva.git


The following commit(s) were added to refs/heads/archiva-2.x by this push:
     new 7a62783  Fixing workspace prepare script
7a62783 is described below

commit 7a62783382334a6a5bb52c1491a8890560ed8e25
Author: Martin Stockhammer <marti...@apache.org>
AuthorDate: Wed Oct 24 22:55:30 2018 +0200

    Fixing workspace prepare script
---
 src/ci/scripts/prepareWorkspace.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/ci/scripts/prepareWorkspace.sh 
b/src/ci/scripts/prepareWorkspace.sh
index 941a99e..052d6e2 100644
--- a/src/ci/scripts/prepareWorkspace.sh
+++ b/src/ci/scripts/prepareWorkspace.sh
@@ -22,7 +22,7 @@
 #
 #  Removes directories that are not used anymore.
 ##
-ATTIC_DIRS="archiva-modules/archiva-base/archiva-indexer"
+ATTIC_DIRS=""
 REMOVE_DIRS=".indexer"
 TMP_DIRECTORY=".tmp"
 
@@ -44,10 +44,12 @@ if [ -e "${TMP_DIRECTORY}" ]; then
 fi
 mkdir -p "${TMP_DIRECTORY}"
 
-if [ -d "${REPO_DIR}" ]; then
-  rm -rf "${REPO_DIR}"
-else
-  echo "WARNING: Directory not found ${REPO_DIR}"
+if [ ! -z "${REPO_DIR}" ]; then
+  if [ -d "${REPO_DIR}" ]; then
+    rm -rf "${REPO_DIR}"
+  else
+    echo "WARNING: Directory not found ${REPO_DIR}"
+  fi
 fi
 
 for i in ${ATTIC_DIRS}; do