ControlScripts/clients: clients killing bug resolved

diff --git a/ClientWorkingFolders/TorrentsAndData/.gitignore b/ClientWorkingFolders/TorrentsAndData/.gitignore
index f26c584..7b6ccc4 100644 (file)
--- a/ClientWorkingFolders/TorrentsAndData/.gitignore
+++ b/ClientWorkingFolders/TorrentsAndData/.gitignore
@@ -1,5 +1 @@
-/Data.16M
-/Data.4M
-/Data.256M
-/Data.64M
-/Data.1024M
+/Data.*

diff --git a/ControlScripts/clients/next-share/stop_nextshare.sh b/ControlScripts/clients/next-share/stop_nextshare.sh
index 406f464..8c48d91 100755 (executable)
--- a/ControlScripts/clients/next-share/stop_nextshare.sh
+++ b/ControlScripts/clients/next-share/stop_nextshare.sh
@@ -12,4 +12,4 @@ if [ ! $# -eq 0 ]; then
        exit 1
 fi
 
-pkill -f cmdlinedl.py
+pkill -KILL -f cmdlinedl.py

diff --git a/ControlScripts/clients/swift/stop_swift.sh b/ControlScripts/clients/swift/stop_swift.sh
index c59a8f9..e373a9c 100755 (executable)
--- a/ControlScripts/clients/swift/stop_swift.sh
+++ b/ControlScripts/clients/swift/stop_swift.sh
@@ -11,4 +11,4 @@ if [ ! $# -eq 0 ]; then
        exit 1
 fi
 
-pkill swift
+pkill -KILL -f swift

diff --git a/ControlScripts/clients/tribler/stop_tribler.sh b/ControlScripts/clients/tribler/stop_tribler.sh
index 65229ec..3ecb2de 100755 (executable)
--- a/ControlScripts/clients/tribler/stop_tribler.sh
+++ b/ControlScripts/clients/tribler/stop_tribler.sh
@@ -11,4 +11,4 @@ if [ ! $# -eq 0 ]; then
        exit 1
 fi
 
-pkill python2.6
+pkill -KILL -f python2.6

diff --git a/ControlScripts/run_campaign.sh b/ControlScripts/run_campaign.sh
index 99d9135..f6c277c 100755 (executable)
--- a/ControlScripts/run_campaign.sh
+++ b/ControlScripts/run_campaign.sh
@@ -48,8 +48,7 @@ if [ ! -f $CONFIG_FILES_REL_PATH/$CAMPAIGN_FILE ]; then
 fi
 
 # Kill all the clients that are still running
-./stop_all_clients.sh
-
+#./stop_all_clients.sh
 
 # Create the results folder for the campaign
 # Check if the campaign results folder already exists