Renamed globalconfig.txt to globalconfig

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

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 3b436d74b8f5e2b0b65599750531453608d2df08..fb497ef67f204acd9ac94e13cd167492d05abfea 100755 (executable)
--- 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 15869069636cb97927d26975e9f205cbdb371ff7..cbb8eacd74efd587fffaf731f2ab39f5acd41e72 100755 (executable)
--- 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 d1f3b148e3199ceac9727064a73b1389031eaa53..dca8da39c90404a9ad117cb85930370dd973d37f 100755 (executable)
--- 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 e49ec1193bc04e8df7f5f344f95b1a404a387969..f24d787821ee378520b7c8308058e192fff197ad 100755 (executable)
--- 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 4b58448ec68ad2e9ca4307ffcb05fe80c82768ea..520883dcc495a9630ed2a0bd0fc4e5e597740aa1 100755 (executable)
--- 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 a376309eef528868bb89fba80ddb4c0d2e397a2c..3d9ba409d62eec65ed496cd5f813391af198cbe2 100755 (executable)
--- 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 fa5fc98956bba0985b40ed257130547958c4666d..597775fe1a077966f2992efeb07cdd47372dd33b 100755 (executable)
--- 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 4faf1f0d5bd6f2955636ee7e5f08cabe585fe38c..c465d3985744089415cd9d2db0b4f2e1e582d67e 100755 (executable)
--- 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 58c186bd7542de168a899813b45ef0528a0c4978..00c09e337803935fed896571f4a1bb6ccde27d9b 100755 (executable)
--- 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 19c44e811cb121ebdac41bc71e5abc12d2d114be..4a79506241e45a8a502fd69709dab5d96b39c003 100755 (executable)
--- 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 ff5f7d4f0cc67608f863b15767e267e74cb55d08..81371eaab6eac7bad4ae52507b102e8a7ad74c62 100755 (executable)
--- 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 817136cd69d8ccda091586d96c22a4b5d560e385..5fa25e61b107e4f6c9fc65b3f34f5335d0743414 100755 (executable)
--- 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 67ecd338dbbe28fd32bc08fb09f131f44c95d7dd..b2b21703e84e83df890828cd6c862b99939f5e61 100755 (executable)
--- 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 3ed77de2208ab7e591011709d6b74faed7e717af..325e2df476f4d93da53d5ec1e4cacd6c328003d2 100755 (executable)
--- 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 948394bd191d73421015e2d38787c0122442400e..19a87a13535acaa0d3e4d3db4a7e3c71b1086e3c 100755 (executable)
--- 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 5e6dcc5fda0cb9b7f11b3e698168d0dcd3ddc8b6..7f7dd8cab634707c2bccd3709f13ae6b39e192e6 100755 (executable)
--- 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 cf5238888fa643e223e6f9406d95358e74e74fba..0bc2a46b944e7c070b7599d703aa46b4ea6dcf9a 100755 (executable)
--- 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 785e9e3df630514c71cb53d36f1533478dd4ccb7..5c7c94ef1db916d0361d4fe19be08cadab363955 100755 (executable)
--- 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 afff0622fdfe62ace5e709a301b3c5600e3aaf50..4af2b73a06a1aa071bd3d1c6bc1cf085463b1d3a 100755 (executable)
--- 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 fd65c89d33cf3258bef6a6a0cf426afdd2ed6e81..1ced71b777b976db4654ab10a5e80baf18940774 100755 (executable)
--- 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 c8058a90b7948592229440d8b8b3f3f931c0c177..3a7ee72dbb72620350cb71358bdb8a3546acda19 100755 (executable)
--- 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 ca47186c7db08c59e6d3c65089a844364f362549..616cb9da339308dd159ecddc70defcd82463f0eb 100755 (executable)
--- 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 570deb3fdc55861dcec1040eae839ea59046eb6e..821159a2ec627868c097ccf0b1e54b643dbd66d3 100755 (executable)
--- 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