From 9fd624065737981f5f04b7380accb238b15d9766 Mon Sep 17 00:00:00 2001 From: George Milescu Date: Fri, 6 Aug 2010 13:10:39 +0200 Subject: [PATCH] Renamed globalconfig.txt to globalconfig Signed-off-by: George Milescu --- ConfigFiles/{globalconfig.txt => globalconfig} | 0 ControlScripts/_grep_search.sh | 2 +- ControlScripts/_show_version.sh | 2 +- ControlScripts/_sync_cluster.sh | 2 +- ControlScripts/_sync_cluster_containers.sh | 2 +- ControlScripts/_sync_kth.sh | 2 +- ControlScripts/_sync_single_cluster_container.sh | 2 +- ControlScripts/_sync_single_cluster_container_scripts.sh | 2 +- ControlScripts/_sync_swarm.cs.pub.ro.sh | 2 +- ControlScripts/_sync_vm.sh | 2 +- ControlScripts/detect_complete_client.sh | 2 +- ControlScripts/parse_client_log.sh | 2 +- ControlScripts/run_campaign.sh | 2 +- ControlScripts/run_scenario.sh | 2 +- ControlScripts/schedule_client.sh | 2 +- ControlScripts/start_doe.sh | 2 +- ControlScripts/start_hrk_leecher.sh | 5 +---- 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 +- 24 files changed, 23 insertions(+), 26 deletions(-) rename ConfigFiles/{globalconfig.txt => globalconfig} (100%) diff --git a/ConfigFiles/globalconfig.txt b/ConfigFiles/globalconfig similarity index 100% rename from ConfigFiles/globalconfig.txt rename to ConfigFiles/globalconfig diff --git a/ControlScripts/_grep_search.sh b/ControlScripts/_grep_search.sh index 3b436d7..fb497ef 100755 --- a/ControlScripts/_grep_search.sh +++ b/ControlScripts/_grep_search.sh @@ -12,7 +12,7 @@ # Read the global configuration variables -source ../ConfigFiles/globalconfig.txt +source ../ConfigFiles/globalconfig cd $TRIBLER_REL_PATH diff --git a/ControlScripts/_show_version.sh b/ControlScripts/_show_version.sh index 1586906..cbb8eac 100755 --- a/ControlScripts/_show_version.sh +++ b/ControlScripts/_show_version.sh @@ -8,7 +8,7 @@ # * starts a tribler cmd-line instance to display the current version # Read the global configuration variables -source ../ConfigFiles/globalconfig.txt +source ../ConfigFiles/globalconfig export PYTHONPATH=$PYTHONPATH:. diff --git a/ControlScripts/_sync_cluster.sh b/ControlScripts/_sync_cluster.sh index d1f3b14..dca8da3 100755 --- a/ControlScripts/_sync_cluster.sh +++ b/ControlScripts/_sync_cluster.sh @@ -4,7 +4,7 @@ # # Read the global configuration variables -source ../ConfigFiles/globalconfig.txt +source ../ConfigFiles/globalconfig rsync -avP --del $P2P_NEXT_REL_PATH p2p@p2p-next-01.grid.pub.ro:/home/p2p/george/P2P-Next rsync -avP --del $P2P_NEXT_REL_PATH p2p@p2p-next-03.grid.pub.ro:/home/p2p/george/P2P-Next diff --git a/ControlScripts/_sync_cluster_containers.sh b/ControlScripts/_sync_cluster_containers.sh index e49ec11..f24d787 100755 --- a/ControlScripts/_sync_cluster_containers.sh +++ b/ControlScripts/_sync_cluster_containers.sh @@ -4,7 +4,7 @@ # # Read the global configuration variables -source ../ConfigFiles/globalconfig.txt +source ../ConfigFiles/globalconfig for host in p2p-next-01.grid.pub.ro p2p-next-03.grid.pub.ro p2p-next-04.grid.pub.ro p2p-next-05.grid.pub.ro p2p-next-06.grid.pub.ro p2p-next-07.grid.pub.ro p2p-next-08.grid.pub.ro p2p-next-09.grid.pub.ro p2p-next-10.grid.pub.ro; do for port in 10122 10222 10322 10422 10522 10622 10722 10822 10922 11022; do diff --git a/ControlScripts/_sync_kth.sh b/ControlScripts/_sync_kth.sh index 4b58448..520883d 100755 --- a/ControlScripts/_sync_kth.sh +++ b/ControlScripts/_sync_kth.sh @@ -4,6 +4,6 @@ # # Read the global configuration variables -source ../ConfigFiles/globalconfig.txt +source ../ConfigFiles/globalconfig rsync -avP --del $P2P_NEXT_REL_PATH george@p2p-next.xen.ssvl.kth.se:/home/george/P2P-Next diff --git a/ControlScripts/_sync_single_cluster_container.sh b/ControlScripts/_sync_single_cluster_container.sh index a376309..3d9ba40 100755 --- a/ControlScripts/_sync_single_cluster_container.sh +++ b/ControlScripts/_sync_single_cluster_container.sh @@ -9,7 +9,7 @@ if test $# -ne 2; then fi # Read the global configuration variables -source ../ConfigFiles/globalconfig.txt +source ../ConfigFiles/globalconfig host=$1 port=$2 diff --git a/ControlScripts/_sync_single_cluster_container_scripts.sh b/ControlScripts/_sync_single_cluster_container_scripts.sh index fa5fc98..597775f 100755 --- a/ControlScripts/_sync_single_cluster_container_scripts.sh +++ b/ControlScripts/_sync_single_cluster_container_scripts.sh @@ -9,7 +9,7 @@ if test $# -ne 2; then fi # Read the global configuration variables -source ../ConfigFiles/globalconfig.txt +source ../ConfigFiles/globalconfig host=$1 port=$2 diff --git a/ControlScripts/_sync_swarm.cs.pub.ro.sh b/ControlScripts/_sync_swarm.cs.pub.ro.sh index 4faf1f0..c465d39 100755 --- a/ControlScripts/_sync_swarm.cs.pub.ro.sh +++ b/ControlScripts/_sync_swarm.cs.pub.ro.sh @@ -4,6 +4,6 @@ # # Read the global configuration variables -source ../ConfigFiles/globalconfig.txt +source ../ConfigFiles/globalconfig rsync -avP --del $P2P_NEXT_REL_PATH george@swarm.cs.pub.ro:/home/george/P2P-Next diff --git a/ControlScripts/_sync_vm.sh b/ControlScripts/_sync_vm.sh index 58c186b..00c09e3 100755 --- a/ControlScripts/_sync_vm.sh +++ b/ControlScripts/_sync_vm.sh @@ -4,7 +4,7 @@ # # Read the global configuration variables -source ../ConfigFiles/globalconfig.txt +source ../ConfigFiles/globalconfig rsync -avP --del $P2P_NEXT_REL_PATH george@tracker.local:/home/george/P2P-Next rsync -avP --del $P2P_NEXT_REL_PATH george@coordinator.local:/home/george/P2P-Next diff --git a/ControlScripts/detect_complete_client.sh b/ControlScripts/detect_complete_client.sh index 19c44e8..4a79506 100755 --- a/ControlScripts/detect_complete_client.sh +++ b/ControlScripts/detect_complete_client.sh @@ -17,7 +17,7 @@ if test $# -ne 1; then fi # Read the global configuration variables -source ../ConfigFiles/globalconfig.txt +source ../ConfigFiles/globalconfig # Read scenarion configuration file (CLIENT_TYPE) source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config diff --git a/ControlScripts/parse_client_log.sh b/ControlScripts/parse_client_log.sh index ff5f7d4..81371ea 100755 --- a/ControlScripts/parse_client_log.sh +++ b/ControlScripts/parse_client_log.sh @@ -17,7 +17,7 @@ if test $# -ne 2; then fi # Read the global configuration variables -source ../ConfigFiles/globalconfig.txt +source ../ConfigFiles/globalconfig # Read scenarion configuration file (CLIENT_TYPE) source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config diff --git a/ControlScripts/run_campaign.sh b/ControlScripts/run_campaign.sh index 817136c..5fa25e6 100755 --- a/ControlScripts/run_campaign.sh +++ b/ControlScripts/run_campaign.sh @@ -18,7 +18,7 @@ if [ ! $# -eq 1 ]; then fi # Read the global configuration variables -source ../ConfigFiles/globalconfig.txt +source ../ConfigFiles/globalconfig # Read arguments CAMPAIGN_FILE=$1 diff --git a/ControlScripts/run_scenario.sh b/ControlScripts/run_scenario.sh index 67ecd33..b2b2170 100755 --- a/ControlScripts/run_scenario.sh +++ b/ControlScripts/run_scenario.sh @@ -38,7 +38,7 @@ if [ ! $# -eq 3 ]; then fi # Read the global configuration variables -source ../ConfigFiles/globalconfig.txt +source ../ConfigFiles/globalconfig # Read arguments ACTION=$1 diff --git a/ControlScripts/schedule_client.sh b/ControlScripts/schedule_client.sh index 3ed77de..325e2df 100755 --- a/ControlScripts/schedule_client.sh +++ b/ControlScripts/schedule_client.sh @@ -16,7 +16,7 @@ DEBUG() } # Read the global configuration variables -source ../ConfigFiles/globalconfig.txt +source ../ConfigFiles/globalconfig # Read scenarion configuration file source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config diff --git a/ControlScripts/start_doe.sh b/ControlScripts/start_doe.sh index 948394b..19a87a1 100755 --- a/ControlScripts/start_doe.sh +++ b/ControlScripts/start_doe.sh @@ -9,7 +9,7 @@ # * at the end deletes the downloaded data # Read the global configuration variables -source ../ConfigFiles/globalconfig.txt +source ../ConfigFiles/globalconfig # Read scenarion configuration file (TORRENT_FILE) source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config diff --git a/ControlScripts/start_hrk_leecher.sh b/ControlScripts/start_hrk_leecher.sh index 5e6dcc5..7f7dd8c 100755 --- a/ControlScripts/start_hrk_leecher.sh +++ b/ControlScripts/start_hrk_leecher.sh @@ -10,14 +10,11 @@ # * at the end deletes the downloaded data # Read the global configuration variables -source ../ConfigFiles/globalconfig.txt +source ../ConfigFiles/globalconfig # Read scenarion configuration file (TORRENT_FILE) source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config -# Read the global configuration variables -source ../ConfigFiles/globalconfig.txt - cd $WORKING_FOLDER_REL_PATH/Regular/ LD_LIBRARY_PATH=$HRK_ABS_PATH/../libtorrent-rasterbar/lib $HRK_ABS_PATH/hrktorrent ../TorrentsAndData/$TORRENT_FILE diff --git a/ControlScripts/start_hrk_seeder.sh b/ControlScripts/start_hrk_seeder.sh index cf52388..0bc2a46 100755 --- a/ControlScripts/start_hrk_seeder.sh +++ b/ControlScripts/start_hrk_seeder.sh @@ -10,7 +10,7 @@ # * at the end deletes the downloaded data # Read the global configuration variables -source ../ConfigFiles/globalconfig.txt +source ../ConfigFiles/globalconfig # Read scenarion configuration file (TORRENT_FILE) source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config diff --git a/ControlScripts/start_leecher.sh b/ControlScripts/start_leecher.sh index 785e9e3..5c7c94e 100755 --- a/ControlScripts/start_leecher.sh +++ b/ControlScripts/start_leecher.sh @@ -9,7 +9,7 @@ # * at the end deletes the downloaded data # Read the global configuration variables -source ../ConfigFiles/globalconfig.txt +source ../ConfigFiles/globalconfig # Read scenarion configuration file (TORRENT_FILE) source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config diff --git a/ControlScripts/start_proxy.sh b/ControlScripts/start_proxy.sh index afff062..4af2b73 100755 --- a/ControlScripts/start_proxy.sh +++ b/ControlScripts/start_proxy.sh @@ -17,7 +17,7 @@ if [ ! $# -eq 1 ]; then fi # Read the global configuration variables -source ../ConfigFiles/globalconfig.txt +source ../ConfigFiles/globalconfig # Read scenarion configuration file source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config diff --git a/ControlScripts/start_seeder.sh b/ControlScripts/start_seeder.sh index fd65c89..1ced71b 100755 --- a/ControlScripts/start_seeder.sh +++ b/ControlScripts/start_seeder.sh @@ -8,7 +8,7 @@ # * starts a command line BT client seeding the supplied .torrent file. The .torrent file must be located in the TorrentsAndData folder # Read the global configuration variables -source ../ConfigFiles/globalconfig.txt +source ../ConfigFiles/globalconfig # Read scenarion configuration file (TORRENT_FILE) source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config diff --git a/ControlScripts/start_tracker.sh b/ControlScripts/start_tracker.sh index c8058a9..3a7ee72 100755 --- a/ControlScripts/start_tracker.sh +++ b/ControlScripts/start_tracker.sh @@ -8,7 +8,7 @@ # * starts a tracker listening on port 6969 # Read the global configuration variables -source ../ConfigFiles/globalconfig.txt +source ../ConfigFiles/globalconfig # Read scenarion configuration file source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config diff --git a/ControlScripts/start_tribler.sh b/ControlScripts/start_tribler.sh index ca47186..616cb9d 100755 --- a/ControlScripts/start_tribler.sh +++ b/ControlScripts/start_tribler.sh @@ -8,7 +8,7 @@ # * starts a GUI tribler instance # Read the global configuration variables -source ../ConfigFiles/globalconfig.txt +source ../ConfigFiles/globalconfig # Read scenarion configuration file source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config diff --git a/ControlScripts/stop_client.sh b/ControlScripts/stop_client.sh index 570deb3..821159a 100755 --- a/ControlScripts/stop_client.sh +++ b/ControlScripts/stop_client.sh @@ -11,7 +11,7 @@ _DEBUG="on" # Read the global configuration variables -source ../ConfigFiles/globalconfig.txt +source ../ConfigFiles/globalconfig # Read scenarion configuration file (CLIENT_TYPE) source ${BASE_PATH}/ClientWorkingFolders/TmpLogs/scenario_config -- 2.20.1