mcconnell 2003/08/22 06:41:11
Modified: merlin/merlin-platform/src/bin merlin.sh
Added: merlin/merlin-platform/src/bin merlin1.sh
Log:
Updates submitted by Alexis.
Revision Changes Path
1.7 +7 -8 avalon-sandbox/merlin/merlin-platform/src/bin/merlin.sh
Index: merlin.sh
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/src/bin/merlin.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- merlin.sh 19 Aug 2003 11:02:57 -0000 1.6
+++ merlin.sh 22 Aug 2003 13:41:11 -0000 1.7
@@ -113,12 +113,7 @@
JVM_OPTS="-Djava.ext.dirs=$JVM_EXT_DIRS"
# Get the run cmd
-RUN_CMD="$JAVA_HOME/bin/java $JVM_OPTS \
- $DEBUG \
- $MERLIN_JVM_OPTS \
- -Dmerlin.home="$MERLIN_HOME" \
- -jar "$MERLIN_HOME/bin/merlin-bootstrap-1.0.jar" \
- $*"
+RUN_CMD="$JAVA_HOME/bin/java $JVM_OPTS $DEBUG $MERLIN_JVM_OPTS
-Dmerlin.home=$MERLIN_HOME -jar $MERLIN_HOME/bin/merlin-bootstrap-1.0.jar $*"
echo "Using MERLIN_HOME: $MERLIN_HOME"
echo "Using JAVA_HOME: $JAVA_HOME"
@@ -157,8 +152,12 @@
if [ -f $MERLIN_PID ]
then
- echo "Already Running!!"
- exit 1
+ if ps -p `cat $MERLIN_PID` >/dev/null 2>/dev/null
+ then
+ echo "Already Running!!"
+ exit 1
+ fi
+
fi
echo "STARTED Merlin `date`" >> $MERLIN_CONSOLE
1.1 avalon-sandbox/merlin/merlin-platform/src/bin/merlin1.sh
Index: merlin1.sh
===================================================================
#! /bin/sh
# Checking for JAVA_HOME is required on *nix due
# to some distributions stupidly including kaffe in /usr/bin
if [ "$JAVA_HOME" = "" ] ; then
echo "ERROR: JAVA_HOME not found in your environment."
echo
echo "Please, set the JAVA_HOME variable in your environment to match the"
echo "location of the Java Virtual Machine you want to use."
exit 1
fi
# Checking for JAVA_HOME is required on *nix due
# to some distributions stupidly including kaffe in /usr/bin
if [ "$MERLIN_HOME" = "" ] ; then
echo "ERROR: MERLIN_HOME not found in your environment."
echo
echo "Please, set the MERLIN_HOME variable in your environment to match the"
echo "location of Merlin distribution."
exit 1
fi
RUN_CMD="$JAVA_HOME/bin/java -Dmerlin.home=$MERLIN_HOME
-Djava.ext.dirs=$MERLIN_HOME/ext -jar $MERLIN_HOME/bin/merlin-bootstrap-1.0.jar $*"
echo "RUN CMD IS: $RUN_CMD"
exec $RUN_CMD
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
