Merges George changes

[p2p-testing-infrastructure.git] / ControlScripts / clients / tribler / start_tribler_proxy.sh

diff --git a/ControlScripts/clients/tribler/start_tribler_proxy.sh b/ControlScripts/clients/tribler/start_tribler_proxy.sh
index 89af2bf..20bf024 100755 (executable)
--- a/ControlScripts/clients/tribler/start_tribler_proxy.sh
+++ b/ControlScripts/clients/tribler/start_tribler_proxy.sh
@@ -9,13 +9,13 @@
 #  * at the end deletes the state directory
 #
 # Script arguments:
-#  * proxy number [1-4]
+#  * proxy number [1-4] (optional)
 #
 # If you run this script manually, you must run it from the P2P-Testing-Infrastructure/ControlScripts folder and use one argument: the the proxy number
 #
 
-if [ ! $# -eq 1 ]; then
-       echo "usage: $0 proxy-no"
+if [ $# -ge 2 ]; then
+       echo "usage: $0 [proxy-no]"
        exit 1
 fi
 
@@ -35,13 +35,23 @@ else
        source ../ClientWorkingFolders/TmpLogs/node_config
 fi
 
-# Read arguments
-PROXY_NO=$1
-
-export PYTHONPATH=$PYTHONPATH:.
-
-cd $TRIBLER_REL_PATH
-
-python2.6 Tribler/Tools/proxy-cmdline.py --proxymode off --proxyservice on --port 25123 --test-mode helper --state-dir $WORKING_FOLDER_REL_PATH/Proxy$PROXY_NO/statedir --no-download
+if $# -eq 1; then
+       # Read arguments
+       PROXY_NO=$1
+       
+       export PYTHONPATH=$PYTHONPATH:.
+       
+       cd $TRIBLER_REL_PATH
+       
+       python2.6 Tribler/Tools/proxy-cmdline.py --proxyservice on --doemode off --test-mode proxy --port 25123 --state-dir $WORKING_FOLDER_REL_PATH/Proxy$PROXY_NO/statedir --no-download
+
+       rm -rf $WORKING_FOLDER_REL_PATH/Proxy$PROXY_NO/*
+else
+       export PYTHONPATH=$PYTHONPATH:.
+       
+       cd $TRIBLER_REL_PATH
+       
+       python2.6 Tribler/Tools/proxy-cmdline.py --proxyservice on --doemode off --test-mode proxy --port 25123 --no-download
 
-rm -rf $WORKING_FOLDER_REL_PATH/Proxy$PROXY_NO/*
+       rm -rf $WORKING_FOLDER_REL_PATH/Proxy$PROXY_NO/*
+fi