|
 |
00e431e |
diff -up ./extra/unix/bin/jetty.sh.fix ./extra/unix/bin/jetty.sh
|
|
|
00e431e |
--- ./extra/unix/bin/jetty.sh.fix 2009-01-06 16:01:00.000000000 -0500
|
|
|
00e431e |
+++ ./extra/unix/bin/jetty.sh 2009-01-06 16:03:55.000000000 -0500
|
|
|
00e431e |
@@ -1,4 +1,4 @@
|
|
|
00e431e |
-#!/bin/sh
|
|
|
00e431e |
+#!/bin/sh
|
|
|
00e431e |
#
|
|
|
00e431e |
# Startup script for jetty under *nix systems (it works under NT/cygwin too).
|
|
|
00e431e |
#
|
|
|
00e431e |
@@ -106,6 +106,13 @@ findDirectory()
|
|
|
00e431e |
done
|
|
|
00e431e |
}
|
|
|
00e431e |
|
|
|
00e431e |
+##################################################
|
|
|
00e431e |
+# Check if we have a tty
|
|
|
00e431e |
+##################################################
|
|
|
00e431e |
+have_tty=0
|
|
|
00e431e |
+if [ "`tty`" != "not a tty" ]; then
|
|
|
00e431e |
+ have_tty=1
|
|
|
00e431e |
+fi
|
|
|
00e431e |
|
|
|
00e431e |
##################################################
|
|
|
00e431e |
# See if there's a user-specific configuration file
|
|
|
00e431e |
@@ -323,7 +330,7 @@ then
|
|
|
00e431e |
then
|
|
|
00e431e |
JETTY_CONSOLE=/dev/console
|
|
|
00e431e |
else
|
|
|
00e431e |
- JETTY_CONSOLE=/dev/tty
|
|
|
00e431e |
+ JETTY_CONSOLE=/dev/null
|
|
|
00e431e |
fi
|
|
|
00e431e |
fi
|
|
|
00e431e |
|
|
|
00e431e |
@@ -356,7 +363,7 @@ then
|
|
|
00e431e |
[ -x $J ] || continue
|
|
|
00e431e |
VERSION=`eval $J -version 2>&1`
|
|
|
00e431e |
[ $? = 0 ] || continue
|
|
|
00e431e |
- VERSION=`expr "$VERSION" : '.*"\(1.[0-9\.]*\)"'`
|
|
|
00e431e |
+ VERSION=`expr "$VERSION" : '.*"\(1.[0-9\._]*\)"'`
|
|
|
00e431e |
[ "$VERSION" = "" ] && continue
|
|
|
00e431e |
expr $VERSION \< 1.2 >/dev/null && continue
|
|
|
00e431e |
echo $VERSION:$J
|
|
|
00e431e |
@@ -466,15 +473,15 @@ RUN_CMD="$JAVA $JAVA_OPTIONS -cp $CLASSP
|
|
|
00e431e |
##################################################
|
|
|
00e431e |
case "$ACTION" in
|
|
|
00e431e |
start)
|
|
|
00e431e |
- echo "Starting Jetty: "
|
|
|
00e431e |
-
|
|
|
00e431e |
if [ -f $JETTY_PID ]
|
|
|
00e431e |
then
|
|
|
00e431e |
echo "Already Running!!"
|
|
|
00e431e |
exit 1
|
|
|
00e431e |
fi
|
|
|
00e431e |
|
|
|
00e431e |
- echo "STARTED Jetty `date`" >> $JETTY_CONSOLE
|
|
|
00e431e |
+ if [ $have_tty -eq 1 ]; then
|
|
|
00e431e |
+ echo "STARTED Jetty `date`" >> $JETTY_CONSOLE
|
|
|
00e431e |
+ fi
|
|
|
00e431e |
|
|
|
00e431e |
nohup sh -c "exec $RUN_CMD >>$JETTY_CONSOLE 2>&1" >/dev/null &
|
|
|
00e431e |
echo $! > $JETTY_PID
|
|
|
00e431e |
@@ -488,7 +495,9 @@ case "$ACTION" in
|
|
|
00e431e |
sleep 2
|
|
|
00e431e |
kill -9 $PID 2>/dev/null
|
|
|
00e431e |
rm -f $JETTY_PID
|
|
|
00e431e |
- echo "STOPPED `date`" >>$JETTY_CONSOLE
|
|
|
00e431e |
+ if [ $have_tty -eq 1 ]; then
|
|
|
00e431e |
+ echo "STOPPED `date`" >>$JETTY_CONSOLE
|
|
|
00e431e |
+ fi
|
|
|
00e431e |
;;
|
|
|
00e431e |
|
|
|
00e431e |
restart)
|
|
|
00e431e |
@@ -533,9 +542,9 @@ case "$ACTION" in
|
|
|
00e431e |
echo "RUN_CMD = $RUN_CMD"
|
|
|
00e431e |
echo
|
|
|
00e431e |
|
|
|
00e431e |
- if [ -f $JETTY_RUN/jetty.pid ]
|
|
|
00e431e |
+ if [ -s $JETTY_PID ]
|
|
|
00e431e |
then
|
|
|
00e431e |
- echo "Jetty running pid="`cat $JETTY_RUN/jetty.pid`
|
|
|
00e431e |
+ echo "Jetty running pid="`cat $JETTY_PID`
|
|
|
00e431e |
exit 0
|
|
|
00e431e |
fi
|
|
|
00e431e |
exit 1
|