X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fpazpar2.sh;h=8debb42542abb2f2276f6d41953a93c7a2d4ce42;hb=edd733fc15f1555c460c1d68d5c8010b30eb80d6;hp=528aa3dcc7f3b610d23243121cb2ad118e271bad;hpb=fe4e965e16384189a4932ffe064f7e07d26d23b7;p=pazpar2-moved-to-github.git

diff --git a/src/pazpar2.sh b/src/pazpar2.sh
index 528aa3d..8debb42 100755
--- a/src/pazpar2.sh
+++ b/src/pazpar2.sh
@@ -2,11 +2,11 @@
 #
 # pazpar2.sh - pazpar2 start/stop script
 
-PAZPAR2_HOME=$HOME/pazpar2
-pazpar2_program=$PAZPAR2_HOME/src/pazpar2
-pazpar2_config=$PAZPAR2_HOME/etc/pazpar2.cfg
-pazpar2_pid=$PAZPAR2_HOME/pazpar2.pid
-pazpar2_log=$PAZPAR2_HOME/pazpar2.log
+: ${PAZPAR2_HOME=$HOME/pazpar2}
+: ${pazpar2_program=$PAZPAR2_HOME/src/pazpar2}
+: ${pazpar2_config=$PAZPAR2_HOME/etc/pazpar2.cfg}
+: ${pazpar2_pid=$PAZPAR2_HOME/pazpar2.pid}
+: ${pazpar2_log=$PAZPAR2_HOME/pazpar2.log}
 
 command=$1; shift
 
@@ -16,7 +16,9 @@ case "$command" in
         	;;
 
 	stop) 
-		test -f $pazpar2_pid && kill `cat $pazpar2_pid`
+		test -f $pazpar2_pid && \
+			kill -0 `cat $pazpar2_pid` 2>/dev/null && \
+			kill -TERM `cat $pazpar2_pid`
         	;;
 
 	# graceful restart - not yet implemented by pazpar2
@@ -26,6 +28,7 @@ case "$command" in
 
 	restart)
 		$0 stop
+		sleep 1 	# let the OS give the port address free
 		$0 start "$@"
 		;;