From 7ac1fdcf079010b6d23872648d25b845e7c955c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?N=C3=A9munaire?= <nemunaire@pomail.fr>
Date: Tue, 13 Jan 2015 08:13:49 +0100
Subject: [PATCH] Various script fixes

---
 backup.sh       | 2 +-
 clear_cache.sh  | 2 +-
 launch.sh       | 4 ++--
 launch_local.sh | 4 ++--
 synchro.sh      | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/backup.sh b/backup.sh
index bfdfdee3..3af478fa 100755
--- a/backup.sh
+++ b/backup.sh
@@ -4,7 +4,7 @@
 
 cd `dirname "$0"`
 
-source config.sh
+. ./config.sh
 
 chown "$SYNCHRO_USER" "$TO_BCKP"
 
diff --git a/clear_cache.sh b/clear_cache.sh
index 024aaf5e..1dde7628 100755
--- a/clear_cache.sh
+++ b/clear_cache.sh
@@ -4,7 +4,7 @@
 
 cd `dirname "$0"`
 
-source config.sh
+. ./config.sh
 
 for n in "$@"
 do
diff --git a/launch.sh b/launch.sh
index d157f502..a1762534 100755
--- a/launch.sh
+++ b/launch.sh
@@ -5,7 +5,7 @@
 rm -f /tmp/stop
 cd `dirname "$0"`
 
-source config.sh
+. ./config.sh
 
 if [ "$UID" = "0" ]
 then
@@ -25,7 +25,7 @@ TMPF=`mktemp`
 tail -f "$TMPF" | ./gen_site.pl -d -s /tmp/scheduler.sock -o ./out ERRORS HOME all DS &
 KP2=$!
 
-trap "kill $KP1 $KP2; rm -rf '$TMPF'; echo" SIGINT SIGTERM
+trap "kill $KP1 $KP2; rm -rf '$TMPF'; echo; kill $$" INT TERM
 
 while ! [ -f /tmp/stop ];
 do
diff --git a/launch_local.sh b/launch_local.sh
index a96bb433..48f6202f 100755
--- a/launch_local.sh
+++ b/launch_local.sh
@@ -5,7 +5,7 @@
 rm -f /tmp/stop
 cd `dirname "$0"`
 
-source config.sh
+. ./config.sh
 
 if [ "$UID" = "0" ]
 then
@@ -25,7 +25,7 @@ TMPF=`mktemp`
 tail -f "$TMPF" | ./gen_site.pl -d -s /tmp/scheduler.sock -bt /challenge/ -ba /challenge-admin/ -o ./out ERRORS HOME all DS &
 KP2=$!
 
-trap "kill $KP1 $KP2; rm -rf '$TMPF'; echo" SIGINT SIGTERM
+trap "kill $KP1 $KP2; rm -rf '$TMPF'; echo; kill $$" INT TERM
 
 while ! [ -f /tmp/stop ];
 do
diff --git a/synchro.sh b/synchro.sh
index aac801eb..06c4de68 100755
--- a/synchro.sh
+++ b/synchro.sh
@@ -5,7 +5,7 @@
 
 cd `dirname "$0"`
 
-source config.sh
+. ./config.sh
 
 if [ "$UID" = "0" ]
 then