Updated tribler scripts to get the torrent file as an argument is no node-config...

Signed-off-by: George Milescu <george.milescu@gmail.com>

diff --git a/ControlScripts/clients/tribler/start_tribler_doe.sh b/ControlScripts/clients/tribler/start_tribler_doe.sh
index 9a280b87c428041689681def48209d1290f45a57..5c2bbd07a26e07ab5c00feb039659abdc6784887 100755 (executable)
--- a/ControlScripts/clients/tribler/start_tribler_doe.sh
+++ b/ControlScripts/clients/tribler/start_tribler_doe.sh
@@ -8,7 +8,7 @@
 #  * starts a tribler cmd-line instance with the supplied .torrent file. The .torrent file must be located in the TorrentsAndData folder
 #  * at the end deletes the downloaded data
 #
-# If you run this script manually, you must run it from the P2P-Testing-Infrastructure/ControlScripts folder
+# If you run this script manually, you must run it from the P2P-Testing-Infrastructure/ControlScripts folder and use one argument: the torrent file name that will be loaded from the TorrentsAndData folder
 #
 
 # Read the global configuration file
@@ -27,6 +27,10 @@ else
        source ../ClientWorkingFolders/TmpLogs/node_config
 fi
 
+if [ " $TORRENT_FILE" = " " ]; then 
+       TORRENT_FILE=$1
+fi
+
 export PYTHONPATH=$PYTHONPATH:.
 
 cd $TRIBLER_REL_PATH

diff --git a/ControlScripts/clients/tribler/start_tribler_leecher.sh b/ControlScripts/clients/tribler/start_tribler_leecher.sh
index 7353376d2bc77473b7172370593e6fa8c011c19e..36bcd058f23e85cc96dde5aed82818a061b156cf 100755 (executable)
--- a/ControlScripts/clients/tribler/start_tribler_leecher.sh
+++ b/ControlScripts/clients/tribler/start_tribler_leecher.sh
@@ -8,7 +8,7 @@
 #  * starts a tribler cmd-line instance with the supplied .torrent file. The .torrent file must be located in the TorrentsAndData folder
 #  * at the end deletes the downloaded data
 #
-# If you run this script manually, you must run it from the P2P-Testing-Infrastructure/ControlScripts folder
+# If you run this script manually, you must run it from the P2P-Testing-Infrastructure/ControlScripts folder and use one argument: the torrent file name that will be loaded from the TorrentsAndData folder
 #
 
 # Read the global configuration file
@@ -27,6 +27,10 @@ else
        source ../ClientWorkingFolders/TmpLogs/node_config
 fi
 
+if [ " $TORRENT_FILE" = " " ]; then 
+       TORRENT_FILE=$1
+fi
+
 export PYTHONPATH=$PYTHONPATH:.
 
 cd $TRIBLER_REL_PATH

diff --git a/ControlScripts/clients/tribler/start_tribler_proxy.sh b/ControlScripts/clients/tribler/start_tribler_proxy.sh
index ada6fde00b6d14e1d7c342fc73086a8576f2ae22..89af2bf2a414c83cf7e13aaf3b946804cab0d7c9 100755 (executable)
--- a/ControlScripts/clients/tribler/start_tribler_proxy.sh
+++ b/ControlScripts/clients/tribler/start_tribler_proxy.sh
@@ -11,7 +11,7 @@
 # Script arguments:
 #  * proxy number [1-4]
 #
-# If you run this script manually, you must run it from the P2P-Testing-Infrastructure/ControlScripts folder
+# 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

diff --git a/ControlScripts/clients/tribler/start_tribler_seeder.sh b/ControlScripts/clients/tribler/start_tribler_seeder.sh
index 023d4e9f0240bd170ff7f48898803b3ba53b63e1..3d4d097580ebc66d6c23c2290ad6d0af2240c512 100755 (executable)
--- a/ControlScripts/clients/tribler/start_tribler_seeder.sh
+++ b/ControlScripts/clients/tribler/start_tribler_seeder.sh
@@ -7,7 +7,7 @@
 #  * changes current working directory to proxyservice-m32
 #  * starts a command line BT client seeding the supplied .torrent file. The .torrent file must be located in the TorrentsAndData folder
 #
-# If you run this script manually, you must run it from the P2P-Testing-Infrastructure/ControlScripts folder
+# If you run this script manually, you must run it from the P2P-Testing-Infrastructure/ControlScripts folder and use one argument: the torrent file name that will be loaded from the TorrentsAndData folder
 #
 
 # Read the global configuration file
@@ -26,6 +26,9 @@ else
        source ../ClientWorkingFolders/TmpLogs/node_config
 fi
 
+if [ " $TORRENT_FILE" = " " ]; then 
+       TORRENT_FILE=$1
+fi
 
 export PYTHONPATH=$PYTHONPATH:.