From 56dbb68a8ca107f146d531e00aa21c942d228b99 Mon Sep 17 00:00:00 2001 From: Razvan Deaconescu Date: Fri, 6 Aug 2010 16:45:34 +0300 Subject: [PATCH] ControlScripts: configurare relative path to scenario_config file --- ControlScripts/detect_complete_client.sh | 2 +- ControlScripts/post-run_bw_limit.sh | 2 +- ControlScripts/post-run_bw_limit_ct.sh | 2 +- ControlScripts/post-run_nop.sh | 2 +- ControlScripts/pre-run_bw_limit.sh | 2 +- ControlScripts/pre-run_bw_limit_ct.sh | 4 ++-- ControlScripts/pre-run_nop.sh | 2 +- ControlScripts/start_doe.sh | 2 +- ControlScripts/start_hrk_leecher.sh | 2 +- ControlScripts/start_hrk_seeder.sh | 2 +- ControlScripts/start_leecher.sh | 2 +- ControlScripts/start_proxy.sh | 2 +- ControlScripts/start_seeder.sh | 2 +- ControlScripts/start_tracker.sh | 2 +- ControlScripts/start_tribler.sh | 2 +- ControlScripts/stop_client.sh | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ControlScripts/detect_complete_client.sh b/ControlScripts/detect_complete_client.sh index 4a79506..64ce19f 100755 --- a/ControlScripts/detect_complete_client.sh +++ b/ControlScripts/detect_complete_client.sh @@ -20,7 +20,7 @@ fi source ../ConfigFiles/globalconfig # Read scenarion configuration file (CLIENT_TYPE) -source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config +source ../ClientWorkingFolders/TmpLogs/scenario_config # Read client mappings configuration file source ../ConfigFiles/client_script_mappings diff --git a/ControlScripts/post-run_bw_limit.sh b/ControlScripts/post-run_bw_limit.sh index 6d7d0eb..6b02bb5 100755 --- a/ControlScripts/post-run_bw_limit.sh +++ b/ControlScripts/post-run_bw_limit.sh @@ -5,6 +5,6 @@ # post-run script for local bandwidth limitation scenarios # source configuration file -source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config +source ../ClientWorkingFolders/TmpLogs/scenario_config ./bw_limit.sh del ${IFACE} diff --git a/ControlScripts/post-run_bw_limit_ct.sh b/ControlScripts/post-run_bw_limit_ct.sh index b48d0bd..5a4ea20 100755 --- a/ControlScripts/post-run_bw_limit_ct.sh +++ b/ControlScripts/post-run_bw_limit_ct.sh @@ -5,6 +5,6 @@ # post-run script for container bandwidth limitation scenarios # source configuration file -source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config +source ../ClientWorkingFolders/TmpLogs/scenario_config ./bw_limit_ct.sh del ${IFACE} diff --git a/ControlScripts/post-run_nop.sh b/ControlScripts/post-run_nop.sh index 57207de..73b99f2 100755 --- a/ControlScripts/post-run_nop.sh +++ b/ControlScripts/post-run_nop.sh @@ -5,4 +5,4 @@ # pre-run script for client-based limitation scenarios # source configuration file -source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config +source ../ClientWorkingFolders/TmpLogs/scenario_config diff --git a/ControlScripts/pre-run_bw_limit.sh b/ControlScripts/pre-run_bw_limit.sh index fad41f8..657a952 100755 --- a/ControlScripts/pre-run_bw_limit.sh +++ b/ControlScripts/pre-run_bw_limit.sh @@ -5,4 +5,4 @@ # pre-run script for local bandwidth limitation scenarios # source configuration file -source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config +source ../ClientWorkingFolders/TmpLogs/scenario_config diff --git a/ControlScripts/pre-run_bw_limit_ct.sh b/ControlScripts/pre-run_bw_limit_ct.sh index aed7a9d..a0165b8 100755 --- a/ControlScripts/pre-run_bw_limit_ct.sh +++ b/ControlScripts/pre-run_bw_limit_ct.sh @@ -5,6 +5,6 @@ # pre-run script for container bandwidth limitation scenarios # source configuration file -source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config +source ../ClientWorkingFolders/TmpLogs/scenario_config -./bw_limit.sh set ${IFACE} ${DL_BW} ${DL_BURST} ${UL_BW} ${UL_BURST} +./bw_limit_ct.sh set ${IFACE} ${DL_BW} ${DL_BURST} ${UL_BW} ${UL_BURST} diff --git a/ControlScripts/pre-run_nop.sh b/ControlScripts/pre-run_nop.sh index 8682bbb..779bd0a 100755 --- a/ControlScripts/pre-run_nop.sh +++ b/ControlScripts/pre-run_nop.sh @@ -5,6 +5,6 @@ # pre-run script for client-based limitation scenarios # source configuration file -source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config +source ../ClientWorkingFolders/TmpLogs/scenario_config ./bw_limit_ct.sh set ${IFACE} ${DL_BW} ${DL_BURST} ${UL_BW} ${UL_BURST} diff --git a/ControlScripts/start_doe.sh b/ControlScripts/start_doe.sh index 19a87a1..bcb3711 100755 --- a/ControlScripts/start_doe.sh +++ b/ControlScripts/start_doe.sh @@ -12,7 +12,7 @@ source ../ConfigFiles/globalconfig # Read scenarion configuration file (TORRENT_FILE) -source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config +source ../ClientWorkingFolders/TmpLogs/scenario_config export PYTHONPATH=$PYTHONPATH:. diff --git a/ControlScripts/start_hrk_leecher.sh b/ControlScripts/start_hrk_leecher.sh index 7f7dd8c..221bad0 100755 --- a/ControlScripts/start_hrk_leecher.sh +++ b/ControlScripts/start_hrk_leecher.sh @@ -13,7 +13,7 @@ source ../ConfigFiles/globalconfig # Read scenarion configuration file (TORRENT_FILE) -source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config +source ../ClientWorkingFolders/TmpLogs/scenario_config cd $WORKING_FOLDER_REL_PATH/Regular/ diff --git a/ControlScripts/start_hrk_seeder.sh b/ControlScripts/start_hrk_seeder.sh index 0bc2a46..5e1e3b9 100755 --- a/ControlScripts/start_hrk_seeder.sh +++ b/ControlScripts/start_hrk_seeder.sh @@ -13,7 +13,7 @@ source ../ConfigFiles/globalconfig # Read scenarion configuration file (TORRENT_FILE) -source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config +source ../ClientWorkingFolders/TmpLogs/scenario_config cd $WORKING_FOLDER_REL_PATH/TorrentsAndData/ diff --git a/ControlScripts/start_leecher.sh b/ControlScripts/start_leecher.sh index 5c7c94e..3581e53 100755 --- a/ControlScripts/start_leecher.sh +++ b/ControlScripts/start_leecher.sh @@ -12,7 +12,7 @@ source ../ConfigFiles/globalconfig # Read scenarion configuration file (TORRENT_FILE) -source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config +source ../ClientWorkingFolders/TmpLogs/scenario_config export PYTHONPATH=$PYTHONPATH:. diff --git a/ControlScripts/start_proxy.sh b/ControlScripts/start_proxy.sh index 4af2b73..af475d4 100755 --- a/ControlScripts/start_proxy.sh +++ b/ControlScripts/start_proxy.sh @@ -20,7 +20,7 @@ fi source ../ConfigFiles/globalconfig # Read scenarion configuration file -source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config +source ../ClientWorkingFolders/TmpLogs/scenario_config # Read arguments PROXY_NO=$1 diff --git a/ControlScripts/start_seeder.sh b/ControlScripts/start_seeder.sh index 1ced71b..c885f13 100755 --- a/ControlScripts/start_seeder.sh +++ b/ControlScripts/start_seeder.sh @@ -11,7 +11,7 @@ source ../ConfigFiles/globalconfig # Read scenarion configuration file (TORRENT_FILE) -source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config +source ../ClientWorkingFolders/TmpLogs/scenario_config export PYTHONPATH=$PYTHONPATH:. diff --git a/ControlScripts/start_tracker.sh b/ControlScripts/start_tracker.sh index 3a7ee72..65dc392 100755 --- a/ControlScripts/start_tracker.sh +++ b/ControlScripts/start_tracker.sh @@ -11,7 +11,7 @@ source ../ConfigFiles/globalconfig # Read scenarion configuration file -source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config +source ../ClientWorkingFolders/TmpLogs/scenario_config export PYTHONPATH=$PYTHONPATH:. diff --git a/ControlScripts/start_tribler.sh b/ControlScripts/start_tribler.sh index 616cb9d..d2b1b6f 100755 --- a/ControlScripts/start_tribler.sh +++ b/ControlScripts/start_tribler.sh @@ -11,7 +11,7 @@ source ../ConfigFiles/globalconfig # Read scenarion configuration file -source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config +source ../ClientWorkingFolders/TmpLogs/scenario_config export PYTHONPATH=$PYTHONPATH:. diff --git a/ControlScripts/stop_client.sh b/ControlScripts/stop_client.sh index 821159a..733aeb8 100755 --- a/ControlScripts/stop_client.sh +++ b/ControlScripts/stop_client.sh @@ -14,7 +14,7 @@ _DEBUG="on" source ../ConfigFiles/globalconfig # Read scenarion configuration file (CLIENT_TYPE) -source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config +source ../ClientWorkingFolders/TmpLogs/scenario_config # Read client mappings configuration file source ../ConfigFiles/client_script_mappings -- 2.20.1