Update the new SDK teleport example

Author: dieriver

examples/nativeMode/template/README.md

@@ -111,4 +111,4 @@ that are still running.
 ## `doNew.sh`
 
 This is ascript that you can use to start a new instance of your application from a clean state.
-This scrip simply invokes `terminate.sh` and `run.sh` sequentially.
+This script simply invokes `terminate.sh` and `run.sh` sequentially.

examples/new-sdk/teleport/README.md

@@ -101,12 +101,12 @@ Now you can run:
 
 * on Bob:
 ```shell
-python teleport-bob.py
+python bobTest.py
 ```
 
 * on Alice:
 ```shell
-python teleport-alice.py
+python aliceTest.py
 ```
 
 The code assumes you start Bob before starting Alice. Using your knowledge of network programming

…mples/new-sdk/teleport/teleport-alice.py examples/new-sdk/teleport/aliceTest.pyexamples/new-sdk/teleport/teleport-alice.py renamed to examples/new-sdk/teleport/aliceTest.py examples/new-sdk/teleport/teleport-alice.py renamed to examples/new-sdk/teleport/aliceTest.py

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+./terminate.sh
+./run.sh

examples/new-sdk/teleport/teleport-bob.py examples/new-sdk/teleport/bobTest.pyexamples/new-sdk/teleport/teleport-bob.py renamed to examples/new-sdk/teleport/bobTest.py

@@ -6,10 +6,6 @@ if [ ! -f ~/.simulaqron_pids/simulaqron_network_default.pid ]; then
     simulaqron start --nodes=Alice,Bob --network-config-file simulaqron_network.json
 fi
 
-python3 teleport-bob.py &
-SERVERPID=$!
+python3 bobTest.py &
 sleep 1
-python3 teleport-alice.py
-
-# Kill the server after it was used
-kill -9 $SERVERPID
+python3 aliceTest.py

examples/new-sdk/teleport/doNew.sh

@@ -1,14 +1,16 @@
 #!/usr/bin/env sh
-TEST_PIDS=$(ps aux | grep python | grep -E "teleport" | awk {'print $2'})
+TEST_PIDS=$(ps aux | grep python | grep -E "Test" | awk {'print $2'})
 if [ "$TEST_PIDS" != "" ]
 then
         kill -9 $TEST_PIDS
 fi
 
-simulaqron stop
-
 # Check if SimulaQron is running
 if [ -f ~/.simulaqron_pids/simulaqron_network_default.pid ]; then
-    cat $HOME/.simulaqron_pids/simulaqron_network_default.pid | xargs kill -9 
+    if ! simulaqron stop
+    then
+        # Kill the process, only if simulaqron could not be stopped gracefully
+        cat $HOME/.simulaqron_pids/simulaqron_network_default.pid | xargs kill -9
+    fi
 fi