Put the shell script that kills all running daemons into a shell

function to avoid repetition.

1 files changed, 10 insertions, 6 deletions

diff --git a/infrastructure/makebuildenv.pl.in b/infrastructure/makebuildenv.pl.in
index 7705be0f..2130fe98 100755
--- a/infrastructure/makebuildenv.pl.in
+++ b/infrastructure/makebuildenv.pl.in
@@ -428,11 +428,16 @@ __E
 			if (-d "$module/testfiles")
 			{
 				print TESTFILE <<__E;
+kill_daemons()
+{
+	kill_process bbackupd
+	kill_process bbstored
+	kill_process httpserver
+	kill_process s3simulator
+}
+
 echo Killing any running daemons...
-kill_process bbackupd
-kill_process bbstored
-kill_process httpserver
-kill_process s3simulator
+kill_daemons
 __E
 			}
 
@@ -459,8 +464,7 @@ __E
 			if (-d "$module/testfiles")
 			{
 				print TESTFILE <<__E;
-kill_process bbackupd
-kill_process bbstored
+kill_daemons
 __E
 			}