commit 7d8b3b1f6c95369782341175beab34a8104d7097
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Mon Sep 12 13:09:47 2016 -0700
committer Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Mon Sep 12 13:09:47 2016 -0700
tree ab321f3e21efe4114195ce922545b44ba65aa939
parent e38b866af5ad7ec3938ad662a46798f535a9fad8

Pass clean option to onos-setup-karaf

Change-Id: If74914d5c0a4ed0694cf4926fa7deae7927783c8

tools/dev/bin/onos-karaf

diff --git a/tools/dev/bin/onos-karaf b/tools/dev/bin/onos-karaf
index cb44ac0..54b497d 100755
--- a/tools/dev/bin/onos-karaf
+++ b/tools/dev/bin/onos-karaf
@@ -9,12 +9,14 @@
   echo "WARN: This script does not support deploying buck artifacts"
 fi
 
+SETUP_OPTS=""
 # FIXME: temporarily fix 500 error in GUI, need to be improved with a better way
 if echo $* | egrep "\bclean\b"; then
     export KARAF_ROOT=${KARAF_ROOT:-~/Applications/apache-karaf-$KARAF_VERSION}
     export STAGE=$(dirname $KARAF_ROOT)
     echo "Removing data directories..."
     [ -d $KARAF_ROOT ] && rm -fr $STAGE/data
+    SETUP_OPTS="${SETUP_OPTS} clean"
 fi
 
-onos-setup-karaf && karaf "$@"
+onos-setup-karaf $SETUP_OPTS && karaf "$@"