From 8b94c9a300963919d93de76c3a855839ad00c8ff Mon Sep 17 00:00:00 2001 From: brinn <brinn> Date: Mon, 3 Sep 2012 11:28:09 +0000 Subject: [PATCH] Make shutdown.sh exit with an exit value of 1 if the process couldn't be stopped. SVN: 26505 --- openbis/dist/server/shutdown.sh | 37 +++++++++++++++++---------------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/openbis/dist/server/shutdown.sh b/openbis/dist/server/shutdown.sh index 180568a41ab..6df48803665 100755 --- a/openbis/dist/server/shutdown.sh +++ b/openbis/dist/server/shutdown.sh @@ -15,21 +15,22 @@ if [ -f "$JETTY_PID_FILE" ]; then PID=`cat $JETTY_PID_FILE` count=0 while [ 1 ]; do - isPIDRunning $PID - if [ $? -ne 0 ]; then - break - fi - count=$(($count+1)) - if [ $count -eq 10 ]; then - break - fi - sleep 1 - done - - isPIDRunning $PID - if [ $? -ne 0 ]; then - rm -f "$JETTY_PID_FILE" - else - echo "Failed to shutdown PID $PID." > /dev/stderr - fi -fi \ No newline at end of file + isPIDRunning $PID + if [ $? -ne 0 ]; then + break + fi + count=$(($count+1)) + if [ $count -eq 10 ]; then + break + fi + sleep 1 + done + + isPIDRunning $PID + if [ $? -ne 0 ]; then + rm -f "$JETTY_PID_FILE" + else + echo "Failed to shutdown process $PID." > /dev/stderr + exit 1 + fi +fi -- GitLab