Fix start to teardown properly

2 files changed, 24 insertions, 8 deletions

diff --git a/start b/start
new file mode 100755
index 0000000..42d0f7a
--- /dev/null
+++ b/start
@@ -0,0 +1,24 @@
+#!/bin/bash
+set -e
+
+teardown () {
+    echo "Stopping Master"
+    cd ../orchenv-master
+    ./bin/buildbot stop master
+    echo "Stopping Local Slave"
+    cd ../orchenv-slave
+    ./bin/buildslave stop slave
+}
+    
+trap "teardown" SIGINT SIGTERM
+echo "Starting Master"
+cd orchenv-master
+./bin/buildbot start master
+echo "Master started"
+echo "Starting Local Slave"
+cd ../orchenv-slave
+./bin/buildslave start slave
+echo "Local Slave started"
+echo "Starting Bottlerock"
+cd ../bottlerock
+./bin/python2.7 ../source/bottlerock.py
diff --git a/start.sh b/start.sh
deleted file mode 100644
index 7cd630a..0000000
--- a/start.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-set -e
-cd orchenv-master
-./bin/buildbot start master
-cd ../orchenv-slave
-./bin/buildslave start slave
-cd ../bottlerock
-./bin/python2.7 ../source/bottlerock.py