Fix noclean handling

[aquarium] / make-dist.sh

diff --git a/make-dist.sh b/make-dist.sh
index 3c86ae7..2e97d4a 100755 (executable)
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -11,6 +11,7 @@ NOW=`date $DATE_FORMAT`
 DIST=aquarium-$SHA
 SERVER_SCRIPTS_SRC=$WHERE/scripts
 CONF_SRC=$WHERE/src/main/resources
+ARG1="$1"
 
 fail() {
     echo "failed while $1"
@@ -19,9 +20,9 @@ fail() {
 
 checkdist() {
     [ -e $DIST ] && {
-        echo Folder $DIST exists.
-        echo Please remove it before proceeding
-        exit 1
+        echo Folder $DIST exists. Removing it.
+        rm -rf "$DIST"
+        echo
     }
     echo Creating dist dirs
 
@@ -33,10 +34,22 @@ checkdist() {
 }
 
 clean() {
-    local p="$1"
-    [ "$p"="dev" -o "$p"="fast" -o "$p"="noclean" ] || {
-        mvn clean || fail "cleaning compilation artifacts"
-    }
+    local p="$ARG1"
+    if [ -z "$p" ]; then
+      echo
+      echo "==============================="
+      echo "=== mvn clean ================="
+      echo "==============================="
+      echo
+      mvn clean || fail "cleaning compilation artifacts"
+      echo
+    elif [ "$p"="dev" -o "$p"="fast" -o "$p"="noclean" ]; then
+      echo
+      echo "==============================="
+      echo "=== NOT executing mvn clean ==="
+      echo "==============================="
+      echo
+    fi
 }
 
 collectdeps() {
@@ -44,7 +57,11 @@ collectdeps() {
 }
 
 build() {
-    echo "Building Aquarium"
+    echo
+    echo "==============================="
+    echo "=== mvn package ==============="
+    echo "==============================="
+    echo
     mvn package -DskipTests && {
         echo "Copying Aquarium classes"
         aquariumjar=`find target -type f|egrep "aquarium-[0-9\.]+(-SNAPSHOT)?\.jar"`
@@ -53,7 +70,9 @@ build() {
 }
 
 collectconf() {
+    echo
     echo Copying config files from $CONF_SRC
+    echo
     cp $CONF_SRC/log4j.properties $DIST/conf|| fail "copying log4j.properties"
     cp $CONF_SRC/aquarium.properties $DIST/conf || fail "copying aquarium.properties"
     cp $CONF_SRC/policy.yaml $DIST/conf || fail "copying policy.yaml"
@@ -61,7 +80,9 @@ collectconf() {
 }
 
 collectscripts() {
+    echo
     echo Copying scripts from $SERVER_SCRIPTS_SRC
+    echo
     cp $SERVER_SCRIPTS_SRC/aquarium.sh $DIST/bin || fail "copying aquarium.sh"
     cp $SERVER_SCRIPTS_SRC/test.sh $DIST/bin || fail "copying test.sh"
 }