Adding a clean step

Author: akshaisarma

docs/quick-start.md

@@ -19,6 +19,7 @@ By the following the steps in this section, you will:
 Don't want to follow all these Steps? Make sure you have your prerequisites installed and you can just run:
 
 ```bash
+export BULLET_HOME=$(pwd)/bullet-quickstart
 curl -sLo- https://raw.githubusercontent.com/yahoo/bullet-docs/v0.1.2/examples/install-all.sh | bash
 ```
 
@@ -224,12 +225,15 @@ To cleanup all the components we bought up:
 
 |                |                                                                                     |
 | -------------- | ----------------------------------------------------------------------------------- |
-| Storm Topology | ```storm kill bullet```                                                             |
 | UI             | ```ps aux | grep [e]xpress-server.js | awk '{print $2}' | xargs kill```             |
 | Web Service    | ```ps aux | grep [e]xample_context.properties | awk '{print $2}' | xargs kill```    |
 | Storm          | ```ps aux | grep [a]pache-storm-1.0.3 | awk '{print $2}' | xargs kill```            |
+| File System    | ```rm -rf $BULLET_HOME /tmp/dev-storm-zookeeper /tmp/jetty-*```                     |
 
-You can also ```rm -rf $BULLET_HOME /tmp/dev-storm-zookeeper /tmp/jetty-*``` to delete *everything* that we did so far.
+If you were following the [Quicker Start](#quicker-start) script, you can also do
+```bash
+curl -sLo- https://raw.githubusercontent.com/yahoo/bullet-docs/v0.1.2/examples/install-all.sh | bash
+```
 
 ## What did we do?
 

examples/install-all.sh

@@ -19,14 +19,7 @@ println() {
     printf "${FORMAT}\n" $*
 }
 
-export_vars() {
-    local PWD="$(pwd)"
-
-    println "Exporting some variables..."
-    export BULLET_HOME="${PWD}/bullet-quickstart"
-    export BULLET_EXAMPLES=$BULLET_HOME/bullet-examples
-    println "Done!"
-
+print_versions() {
     println "Using the following artifacts..."
     println "Bullet Examples:    ${BULLET_EXAMPLES_VERSION}"
     println "Bullet Web Service: ${BULLET_WS_VERSION}"
@@ -38,6 +31,15 @@ export_vars() {
     println "Done!"
 }
 
+export_vars() {
+    local PWD="$(pwd)"
+
+    println "Exporting some variables..."
+    export BULLET_HOME="${PWD}/bullet-quickstart"
+    export BULLET_EXAMPLES=$BULLET_HOME/bullet-examples
+    println "Done!"
+}
+
 setup() {
     println "Setting up directories..."
     mkdir -p $BULLET_HOME/backend/storm
@@ -187,8 +189,6 @@ launch_bullet_ui() {
 cleanup() {
     set +eo pipefail
 
-    storm kill bullet && sleep 30
-
     ps aux | grep "[e]xpress-server.js" | awk '{print $2}' | xargs kill
 
     ps aux | grep "[e]xample_context.properties" | awk '{print $2}' | xargs kill
@@ -201,20 +201,21 @@ cleanup() {
 }
 
 teardown() {
-    println "Killing all Bullet components. This may take a while if the topology is up..."
+    println "Killing all Bullet components..."
     cleanup &> /dev/null
     println "Done!"
 }
 
 unset_all() {
-    unset -f println export_vars setup install_bullet_examples \
+    unset -f print_versions println export_vars setup install_bullet_examples \
              install_storm launch_storm launch_bullet_storm \
              install_jetty launch_bullet_web_service \
              install_node launch_bullet_ui \
              cleanup teardown unset_all launch
 }
 
 launch() {
+    print_versions
     export_vars
 
     teardown
@@ -236,5 +237,14 @@ launch() {
     unset_all
 }
 
-launch
+clean() {
+    export_vars
+    teardown
+    unset_all
+}
 
+if [ $# -eq 0]; then
+    launch
+else
+    clean
+fi