Updated all source globalconfig with file-check operation

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

diff --git a/ControlScripts/clients/hrk/start_hrk_leecher.sh b/ControlScripts/clients/hrk/start_hrk_leecher.sh
index 221bad021cb125da26c5be49fb14610bc5dc855c..a891afb1ec8b820b2aebfb567ac417d2a01c439e 100755 (executable)
--- a/ControlScripts/clients/hrk/start_hrk_leecher.sh
+++ b/ControlScripts/clients/hrk/start_hrk_leecher.sh
@@ -9,8 +9,13 @@
 #    libtorrent-rasterbar location
 #  * at the end deletes the downloaded data
 
-# Read the global configuration variables
-source ../ConfigFiles/globalconfig
+# Read the global configuration file
+# Check if the global configuration file exists
+if [ ! -e ../../../ConfigFiles/globalconfig ]; then
+       echo "Warning: The global config file ../../../ConfigFiles/globalconfig does not exist."
+else
+       source ../../../ConfigFiles/globalconfig
+fi
 
 # Read scenarion configuration file (TORRENT_FILE)
 source ../ClientWorkingFolders/TmpLogs/scenario_config

diff --git a/ControlScripts/clients/hrk/start_hrk_seeder.sh b/ControlScripts/clients/hrk/start_hrk_seeder.sh
index 5e1e3b9fecfd198524ecfbab4a2fb40ed64ec573..f36e0a2dba5d5fa8e521b606e3ee5598213d51da 100755 (executable)
--- a/ControlScripts/clients/hrk/start_hrk_seeder.sh
+++ b/ControlScripts/clients/hrk/start_hrk_seeder.sh
@@ -9,8 +9,13 @@
 #    libtorrent-rasterbar location
 #  * at the end deletes the downloaded data
 
-# Read the global configuration variables
-source ../ConfigFiles/globalconfig
+# Read the global configuration file
+# Check if the global configuration file exists
+if [ ! -e ../../../ConfigFiles/globalconfig ]; then
+       echo "Warning: The global config file ../../../ConfigFiles/globalconfig does not exist."
+else
+       source ../../../ConfigFiles/globalconfig
+fi
 
 # Read scenarion configuration file (TORRENT_FILE)
 source ../ClientWorkingFolders/TmpLogs/scenario_config

diff --git a/ControlScripts/clients/tribler/start_tribler_doe.sh b/ControlScripts/clients/tribler/start_tribler_doe.sh
index bcb3711dd0c795fea832668335171d4704eae9bb..51ab1d5e7e73e06b8125c25a591456ac1e03347a 100755 (executable)
--- a/ControlScripts/clients/tribler/start_tribler_doe.sh
+++ b/ControlScripts/clients/tribler/start_tribler_doe.sh
@@ -8,8 +8,13 @@
 #  * 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
 
-# Read the global configuration variables
-source ../ConfigFiles/globalconfig
+# Read the global configuration file
+# Check if the global configuration file exists
+if [ ! -e ../../../ConfigFiles/globalconfig ]; then
+       echo "Warning: The global config file ../../../ConfigFiles/globalconfig does not exist."
+else
+       source ../../../ConfigFiles/globalconfig
+fi
 
 # Read scenarion configuration file (TORRENT_FILE)
 source ../ClientWorkingFolders/TmpLogs/scenario_config

diff --git a/ControlScripts/clients/tribler/start_tribler_gui.sh b/ControlScripts/clients/tribler/start_tribler_gui.sh
index d2b1b6f492840aebfd1752319bffecfd2f1581cc..eb06688417f9ee2e73442a078d65c4dc12625ac1 100755 (executable)
--- a/ControlScripts/clients/tribler/start_tribler_gui.sh
+++ b/ControlScripts/clients/tribler/start_tribler_gui.sh
@@ -7,8 +7,13 @@
 #  * changes current working directory to proxymode
 #  * starts a GUI tribler instance
 
-# Read the global configuration variables
-source ../ConfigFiles/globalconfig
+# Read the global configuration file
+# Check if the global configuration file exists
+if [ ! -e ../../../ConfigFiles/globalconfig ]; then
+       echo "Warning: The global config file ../../../ConfigFiles/globalconfig does not exist."
+else
+       source ../../../ConfigFiles/globalconfig
+fi
 
 # Read scenarion configuration file
 source ../ClientWorkingFolders/TmpLogs/scenario_config

diff --git a/ControlScripts/clients/tribler/start_tribler_leecher.sh b/ControlScripts/clients/tribler/start_tribler_leecher.sh
index 3581e53508176a06fe9d3b8d0640458875c9b4ee..c0cee872058ea5c5f95f52cb5c5d261f98935e21 100755 (executable)
--- a/ControlScripts/clients/tribler/start_tribler_leecher.sh
+++ b/ControlScripts/clients/tribler/start_tribler_leecher.sh
@@ -8,8 +8,13 @@
 #  * 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
 
-# Read the global configuration variables
-source ../ConfigFiles/globalconfig
+# Read the global configuration file
+# Check if the global configuration file exists
+if [ ! -e ../../../ConfigFiles/globalconfig ]; then
+       echo "Warning: The global config file ../../../ConfigFiles/globalconfig does not exist."
+else
+       source ../../../ConfigFiles/globalconfig
+fi
 
 # Read scenarion configuration file (TORRENT_FILE)
 source ../ClientWorkingFolders/TmpLogs/scenario_config

diff --git a/ControlScripts/clients/tribler/start_tribler_proxy.sh b/ControlScripts/clients/tribler/start_tribler_proxy.sh
index af475d43553eedb49d4480f09d3e8375e01f97fb..301510eaff4e6bba3c198caeaf953469b8329d18 100755 (executable)
--- a/ControlScripts/clients/tribler/start_tribler_proxy.sh
+++ b/ControlScripts/clients/tribler/start_tribler_proxy.sh
@@ -16,8 +16,13 @@ if [ ! $# -eq 1 ]; then
        exit 1
 fi
 
-# Read the global configuration variables
-source ../ConfigFiles/globalconfig
+# Read the global configuration file
+# Check if the global configuration file exists
+if [ ! -e ../../../ConfigFiles/globalconfig ]; then
+       echo "Warning: The global config file ../../../ConfigFiles/globalconfig does not exist."
+else
+       source ../../../ConfigFiles/globalconfig
+fi
 
 # Read scenarion configuration file
 source ../ClientWorkingFolders/TmpLogs/scenario_config

diff --git a/ControlScripts/clients/tribler/start_tribler_seeder.sh b/ControlScripts/clients/tribler/start_tribler_seeder.sh
index c885f13d923cf9ce9d1c45f44223ec20fb553beb..b8e5f3f895a6ac544bd1ae52668c8d4822919f01 100755 (executable)
--- a/ControlScripts/clients/tribler/start_tribler_seeder.sh
+++ b/ControlScripts/clients/tribler/start_tribler_seeder.sh
@@ -7,8 +7,13 @@
 #  * 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
 
-# Read the global configuration variables
-source ../ConfigFiles/globalconfig
+# Read the global configuration file
+# Check if the global configuration file exists
+if [ ! -e ../../../ConfigFiles/globalconfig ]; then
+       echo "Warning: The global config file ../../../ConfigFiles/globalconfig does not exist."
+else
+       source ../../../ConfigFiles/globalconfig
+fi
 
 # Read scenarion configuration file (TORRENT_FILE)
 source ../ClientWorkingFolders/TmpLogs/scenario_config

diff --git a/ControlScripts/detect_complete_client.sh b/ControlScripts/detect_complete_client.sh
index 64ce19fbce0077d2cd0f30848becf52d565bbfbc..294200b427405fd1de91b9e4746e58f72caa0cd2 100755 (executable)
--- a/ControlScripts/detect_complete_client.sh
+++ b/ControlScripts/detect_complete_client.sh
@@ -16,8 +16,13 @@ if test $# -ne 1; then
        exit 1
 fi
 
-# Read the global configuration variables
-source ../ConfigFiles/globalconfig
+# Read the global configuration file
+# Check if the global configuration file exists
+if [ ! -e ../ConfigFiles/globalconfig ]; then
+       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+else
+       source ../ConfigFiles/globalconfig
+fi
 
 # Read scenarion configuration file (CLIENT_TYPE)
 source ../ClientWorkingFolders/TmpLogs/scenario_config

diff --git a/ControlScripts/parse_client_log.sh b/ControlScripts/parse_client_log.sh
index dbad40e86e351938ce5e4b6885a7c055b152d0cf..228b2ce0520ec0cd452ea383b66c0078629b078a 100755 (executable)
--- a/ControlScripts/parse_client_log.sh
+++ b/ControlScripts/parse_client_log.sh
@@ -16,8 +16,13 @@ if test $# -ne 3; then
        exit 1
 fi
 
-# Read the global configuration variables
-source ../ConfigFiles/globalconfig
+# Read the global configuration file
+# Check if the global configuration file exists
+if [ ! -e ../ConfigFiles/globalconfig ]; then
+       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+else
+       source ../ConfigFiles/globalconfig
+fi
 
 # Read client mappings configuration file
 source ../ConfigFiles/client_script_mappings

diff --git a/ControlScripts/run_campaign.sh b/ControlScripts/run_campaign.sh
index 5fa25e61b107e4f6c9fc65b3f34f5335d0743414..676e9ede75c5332b5c660bda6dd6814b8722ec85 100755 (executable)
--- a/ControlScripts/run_campaign.sh
+++ b/ControlScripts/run_campaign.sh
@@ -17,8 +17,13 @@ if [ ! $# -eq 1 ]; then
        exit 1
 fi
 
-# Read the global configuration variables
-source ../ConfigFiles/globalconfig
+# Read the global configuration file
+# Check if the global configuration file exists
+if [ ! -e ../ConfigFiles/globalconfig ]; then
+       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+else
+       source ../ConfigFiles/globalconfig
+fi
 
 # Read arguments
 CAMPAIGN_FILE=$1

diff --git a/ControlScripts/run_scenario.sh b/ControlScripts/run_scenario.sh
index ba18cd303a84c7b2a4d0cd65e49297ed886be6f0..6bbb014331e0a9d670cfacca00aa7465716d5d3f 100755 (executable)
--- a/ControlScripts/run_scenario.sh
+++ b/ControlScripts/run_scenario.sh
@@ -37,8 +37,13 @@ if [ ! $# -eq 3 ]; then
        exit 1
 fi
 
-# Read the global configuration variables
-source ../ConfigFiles/globalconfig
+# Read the global configuration file
+# Check if the global configuration file exists
+if [ ! -e ../ConfigFiles/globalconfig ]; then
+       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+else
+       source ../ConfigFiles/globalconfig
+fi
 
 # Read arguments
 ACTION=$1

diff --git a/ControlScripts/schedule_client.sh b/ControlScripts/schedule_client.sh
index ac238692530537ac0e4e3dd2ef2015097a957805..59ac82a6f3df46b531a9873d060f42b67a323615 100755 (executable)
--- a/ControlScripts/schedule_client.sh
+++ b/ControlScripts/schedule_client.sh
@@ -10,8 +10,13 @@
 # use _DEBUG="off" to turn off debug printing
 _DEBUG="on"
 
-# Read the global configuration variables
-source ../ConfigFiles/globalconfig
+# Read the global configuration file
+# Check if the global configuration file exists
+if [ ! -e ../ConfigFiles/globalconfig ]; then
+       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+else
+       source ../ConfigFiles/globalconfig
+fi
 
 # Read scenarion configuration file
 source ../ClientWorkingFolders/TmpLogs/scenario_config

diff --git a/ControlScripts/start_tracker.sh b/ControlScripts/start_tracker.sh
index 65dc392673c2e47a177d7646f55c735ecd2da1a1..2f2173ac27aa6e6e5ddb404d2c4797a4dec99622 100755 (executable)
--- a/ControlScripts/start_tracker.sh
+++ b/ControlScripts/start_tracker.sh
@@ -7,8 +7,13 @@
 #  * changes current working directory to BitTornado-CVS
 #  * starts a tracker listening on port 6969
 
-# Read the global configuration variables
-source ../ConfigFiles/globalconfig
+# Read the global configuration file
+# Check if the global configuration file exists
+if [ ! -e ../ConfigFiles/globalconfig ]; then
+       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+else
+       source ../ConfigFiles/globalconfig
+fi
 
 # Read scenarion configuration file
 source ../ClientWorkingFolders/TmpLogs/scenario_config

diff --git a/ControlScripts/stop_client.sh b/ControlScripts/stop_client.sh
index 733aeb8db9dac00958fd37b03c84f52d1ee9d2dc..eab657e646f39bf2bf05820f82fe5d82a989dc60 100755 (executable)
--- a/ControlScripts/stop_client.sh
+++ b/ControlScripts/stop_client.sh
@@ -10,8 +10,13 @@
 # use _DEBUG="off" to turn off debug printing
 _DEBUG="on"
 
-# Read the global configuration variables
-source ../ConfigFiles/globalconfig
+# Read the global configuration file
+# Check if the global configuration file exists
+if [ ! -e ../ConfigFiles/globalconfig ]; then
+       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+else
+       source ../ConfigFiles/globalconfig
+fi
 
 # Read scenarion configuration file (CLIENT_TYPE)
 source ../ClientWorkingFolders/TmpLogs/scenario_config

diff --git a/Utils/grep_search.sh b/Utils/grep_search.sh
index fb497ef67f204acd9ac94e13cd167492d05abfea..333bc711e4dfd45bfeec25c1e98d2e090a28cb8e 100755 (executable)
--- a/Utils/grep_search.sh
+++ b/Utils/grep_search.sh
@@ -11,8 +11,13 @@
 # ./grep_search.sh "text"
 
 
-# Read the global configuration variables
-source ../ConfigFiles/globalconfig
+# Read the global configuration file
+# Check if the global configuration file exists
+if [ ! -e ../ConfigFiles/globalconfig ]; then
+       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+else
+       source ../ConfigFiles/globalconfig
+fi
 
 cd $TRIBLER_REL_PATH
 

diff --git a/Utils/show_version.sh b/Utils/show_version.sh
index cbb8eacd74efd587fffaf731f2ab39f5acd41e72..2769d05cd27c270c0b0488384210997142548373 100755 (executable)
--- a/Utils/show_version.sh
+++ b/Utils/show_version.sh
@@ -7,8 +7,13 @@
 #  * changes current working directory to proxyservice-m32
 #  * starts a tribler cmd-line instance to display the current version
 
-# Read the global configuration variables
-source ../ConfigFiles/globalconfig
+# Read the global configuration file
+# Check if the global configuration file exists
+if [ ! -e ../ConfigFiles/globalconfig ]; then
+       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+else
+       source ../ConfigFiles/globalconfig
+fi
 
 export PYTHONPATH=$PYTHONPATH:.
 

diff --git a/Utils/sync_cluster.sh b/Utils/sync_cluster.sh
index dca8da39c90404a9ad117cb85930370dd973d37f..3e67e7d5f6c0208e458910bf7636d1420eca92ab 100755 (executable)
--- a/Utils/sync_cluster.sh
+++ b/Utils/sync_cluster.sh
@@ -3,8 +3,13 @@
 # Copyright: George Milescu 2010 - george.milescu@gmail.com
 #
 
-# Read the global configuration variables
-source ../ConfigFiles/globalconfig
+# Read the global configuration file
+# Check if the global configuration file exists
+if [ ! -e ../ConfigFiles/globalconfig ]; then
+       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+else
+       source ../ConfigFiles/globalconfig
+fi
 
 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/Utils/sync_cluster_containers.sh b/Utils/sync_cluster_containers.sh
index f24d787821ee378520b7c8308058e192fff197ad..ecda9d921eb5e05ae240de0a307476f51d84b3f5 100755 (executable)
--- a/Utils/sync_cluster_containers.sh
+++ b/Utils/sync_cluster_containers.sh
@@ -3,8 +3,13 @@
 # Copyright: George Milescu 2010 - george.milescu@gmail.com
 #
 
-# Read the global configuration variables
-source ../ConfigFiles/globalconfig
+# Read the global configuration file
+# Check if the global configuration file exists
+if [ ! -e ../ConfigFiles/globalconfig ]; then
+       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+else
+       source ../ConfigFiles/globalconfig
+fi
 
 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/Utils/sync_kth.sh b/Utils/sync_kth.sh
index 520883dcc495a9630ed2a0bd0fc4e5e597740aa1..eb34a3bfa0a205ecc699e4ac5b1d19796fed441c 100755 (executable)
--- a/Utils/sync_kth.sh
+++ b/Utils/sync_kth.sh
@@ -3,7 +3,12 @@
 # Copyright: George Milescu 2010 - george.milescu@gmail.com
 #
 
-# Read the global configuration variables
-source ../ConfigFiles/globalconfig
+# Read the global configuration file
+# Check if the global configuration file exists
+if [ ! -e ../ConfigFiles/globalconfig ]; then
+       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+else
+       source ../ConfigFiles/globalconfig
+fi
 
 rsync -avP --del $P2P_NEXT_REL_PATH george@p2p-next.xen.ssvl.kth.se:/home/george/P2P-Next

diff --git a/Utils/sync_single_cluster_container.sh b/Utils/sync_single_cluster_container.sh
index 3d9ba409d62eec65ed496cd5f813391af198cbe2..6197d72a451f65b60afd47f7af533e9b0ffd921c 100755 (executable)
--- a/Utils/sync_single_cluster_container.sh
+++ b/Utils/sync_single_cluster_container.sh
@@ -8,8 +8,13 @@ if test $# -ne 2; then
        exit 1
 fi
 
-# Read the global configuration variables
-source ../ConfigFiles/globalconfig
+# Read the global configuration file
+# Check if the global configuration file exists
+if [ ! -e ../ConfigFiles/globalconfig ]; then
+       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+else
+       source ../ConfigFiles/globalconfig
+fi
 
 host=$1
 port=$2

diff --git a/Utils/sync_single_cluster_container_scripts.sh b/Utils/sync_single_cluster_container_scripts.sh
index 597775fe1a077966f2992efeb07cdd47372dd33b..c1673100751da402e7ba861944c92d3a73f072ae 100755 (executable)
--- a/Utils/sync_single_cluster_container_scripts.sh
+++ b/Utils/sync_single_cluster_container_scripts.sh
@@ -8,8 +8,13 @@ if test $# -ne 2; then
        exit 1
 fi
 
-# Read the global configuration variables
-source ../ConfigFiles/globalconfig
+# Read the global configuration file
+# Check if the global configuration file exists
+if [ ! -e ../ConfigFiles/globalconfig ]; then
+       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+else
+       source ../ConfigFiles/globalconfig
+fi
 
 host=$1
 port=$2

diff --git a/Utils/sync_swarm.cs.pub.ro.sh b/Utils/sync_swarm.cs.pub.ro.sh
index c465d3985744089415cd9d2db0b4f2e1e582d67e..698aff786998e1f6c5784ccbd7be3ea809944c2e 100755 (executable)
--- a/Utils/sync_swarm.cs.pub.ro.sh
+++ b/Utils/sync_swarm.cs.pub.ro.sh
@@ -3,7 +3,12 @@
 # Copyright: George Milescu 2010 - george.milescu@gmail.com
 #
 
-# Read the global configuration variables
-source ../ConfigFiles/globalconfig
+# Read the global configuration file
+# Check if the global configuration file exists
+if [ ! -e ../ConfigFiles/globalconfig ]; then
+       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+else
+       source ../ConfigFiles/globalconfig
+fi
 
 rsync -avP --del $P2P_NEXT_REL_PATH george@swarm.cs.pub.ro:/home/george/P2P-Next

diff --git a/Utils/sync_vm.sh b/Utils/sync_vm.sh
index 00c09e337803935fed896571f4a1bb6ccde27d9b..81d447838503cff15b0ae568242b5d4946b9c77f 100755 (executable)
--- a/Utils/sync_vm.sh
+++ b/Utils/sync_vm.sh
@@ -3,8 +3,13 @@
 # Copyright: George Milescu 2010 - george.milescu@gmail.com
 #
 
-# Read the global configuration variables
-source ../ConfigFiles/globalconfig
+# Read the global configuration file
+# Check if the global configuration file exists
+if [ ! -e ../ConfigFiles/globalconfig ]; then
+       echo "Warning: The global config file ../ConfigFiles/globalconfig does not exist."
+else
+       source ../ConfigFiles/globalconfig
+fi
 
 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