From ecc3c4e9d82bbe1c303711af56c44846ade406ec Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Sat, 1 Sep 2012 12:27:38 +0000
Subject: [PATCH] Fix typo when detecting whether there is a PID file.
SVN: 26502
---
openbis/dist/server/startup.sh | 4 ++--
openbis/dist/server/status.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/openbis/dist/server/startup.sh b/openbis/dist/server/startup.sh
index dbe42357ac7..82c1c0badf9 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 0713df8552b..3aa6070657b 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
--
GitLab