- die ermittelte PID des ngIRCd wird besser validiert (leer?).

[ngircd-alex.git] / src / testsuite / stop-server.sh

diff --git a/src/testsuite/stop-server.sh b/src/testsuite/stop-server.sh
index af28bae1b567d40ad2073f23824f6b6b8dced88b..0064baf2bf3662b0903f8356452347d327f009c4 100755 (executable)
--- a/src/testsuite/stop-server.sh
+++ b/src/testsuite/stop-server.sh
@@ -1,15 +1,15 @@
 #!/bin/sh
 # ngIRCd Test Suite
-# $Id: stop-server.sh,v 1.4 2002/09/16 09:53:16 alex Exp $
+# $Id: stop-server.sh,v 1.6 2002/09/20 13:57:01 alex Exp $
 
 echo "      stopping server ..."
 
-PS_FLAGS=a; PS_PIDCOL=1
-ps a > /dev/null 2>&1
-if [ $? -ne 0 ]; then PS_FLAGS=-f; PS_PIDCOL=2; fi
+PS_FLAGS=-f; PS_PIDCOL=2
+ps $PS_FLAGS > /dev/null 2>&1
+if [ $? -ne 0 ]; then PS_FLAGS=a; PS_PIDCOL=1; fi
 
 ps $PS_FLAGS > procs.tmp
 pid=`cat procs.tmp | grep ngircd-TEST | awk "{ print \\\$$PS_PIDCOL }"`
-kill $pid > /dev/null 2>&1
+[ -n "$pid" ] && kill -0 $pid > /dev/null 2>&1 || exit 1
 
 # -eof-