diff --git a/openbis/dist/server/startup.sh b/openbis/dist/server/startup.sh index dbe42357ac7a19c5529f5f244c83b2bad26a0bbb..82c1c0badf9aa03c99a5bf7ae45f05312d78617e 100755 --- a/openbis/dist/server/startup.sh +++ b/openbis/dist/server/startup.sh @@ -7,9 +7,9 @@ source `dirname "$0"`/setup-env checkNotRoot -source `dirname "$0"`/status.sh > /dev/null +`dirname "$0"`/status.sh -q if [ $? -eq 0 ]; then - echo openBIS AS already running, shut it down before start a new one. + echo openBIS AS already running, shut it down before starting a new one. exit 1 fi diff --git a/openbis/dist/server/status.sh b/openbis/dist/server/status.sh index 0713df8552b33a802d4a473e0406d9656357931b..3aa6070657b2f81306a98f09c96e679c784b4877 100755 --- a/openbis/dist/server/status.sh +++ b/openbis/dist/server/status.sh @@ -10,7 +10,7 @@ printStatus() if [ "$1" == "-q" ]; then QUIET=1 fi - if [ -f $PIDFILE ]; then + if [ -f $JETTY_PID_FILE ]; then PID=`cat $JETTY_PID_FILE` isPIDRunning $PID if [ $? -eq 0 ]; then