Allowing buck-based onos run to run with or without 'clean' option.

Change-Id: If6f9e584b82c60ff0b85d3931352354c375c49cb

@@ -12,30 +12,38 @@ cd /tmp
 
 
 set -e
 set -e
 
 
-# Blitz previously unrolled onos- directory
-rm -fr onos-*/
-
-# Unroll new image from the specified tar file
-[ -f $ONOS_TAR ] && tar zxf $ONOS_TAR
-
-# Change into the ONOS home directory
-cd onos-*/
-export ONOS_HOME=$PWD
-
-# FIXME: for now we're running using the karaf client; later use raw SSH
-unset ONOS_USE_SSH
-
-# Create config/cluster.json (cluster metadata)
-IP=${ONOS_IP:-127.0.0.1}
-echo "Creating local cluster configs for IP $IP..."
-[ -d $ONOS_HOME/config ] || mkdir -p $ONOS_HOME/config
-cat > $ONOS_HOME/config/cluster.json <<EOF
-{
-  "name": "default",
-  "nodes": [ {"id": "$IP", "ip": "$IP", "port": 9876 } ],
-  "partitions": [ { "id": 1, "members": [ "$IP" ] } ]
-}
+ONOS_DIR=$(tar tf $ONOS_TAR | head -n 1 | cut -d/ -f1)
+
+if [ -d $ONOS_DIR -a "$1" = "clean" ]; then
+    # Blitz previously unrolled onos- directory
+    rm -fr $ONOS_DIR
+
+    # Unroll new image from the specified tar file
+    [ -f $ONOS_TAR ] && tar zxf $ONOS_TAR
+
+    # Change into the ONOS home directory
+    cd $ONOS_DIR
+    export ONOS_HOME=$PWD
+
+    # FIXME: for now we're running using the karaf client; later use raw SSH
+    unset ONOS_USE_SSH
+
+    # Create config/cluster.json (cluster metadata)
+    IP=${ONOS_IP:-127.0.0.1}
+    echo "Creating local cluster configs for IP $IP..."
+    [ -d $ONOS_HOME/config ] || mkdir -p $ONOS_HOME/config
+    cat > $ONOS_HOME/config/cluster.json <<-EOF
+    {
+      "name": "default",
+      "nodes": [ {"id": "$IP", "ip": "$IP", "port": 9876 } ],
+      "partitions": [ { "id": 1, "members": [ "$IP" ] } ]
+    }
 EOF
 EOF
+else
+    # Change into the ONOS home directory
+    cd $ONOS_DIR
+    export ONOS_HOME=$PWD
+fi
 
 
 # Start ONOS as a server, but include any specified options
 # Start ONOS as a server, but include any specified options
 ./bin/onos-service server "$@" &>onos.log &
 ./bin/onos-service server "$@" &>onos.log &