costin 01/09/16 21:59:32 Modified: src/shell shutdown.sh startup.sh tomcat.sh Log: Fix #319 - use $@ instead of "$@". On some unixes it creates problems, and it seems to be right, we want to pass the other params individually, not as a single param. Yet another reason to minimize the use of .sh and maximize the use of java. Revision Changes Path 1.4 +2 -2 jakarta-tomcat/src/shell/shutdown.sh Index: shutdown.sh =================================================================== RCS file: /home/cvs/jakarta-tomcat/src/shell/shutdown.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- shutdown.sh 2001/08/22 04:55:33 1.3 +++ shutdown.sh 2001/09/17 04:59:32 1.4 @@ -1,9 +1,9 @@ #! /bin/sh # -# $Id: shutdown.sh,v 1.3 2001/08/22 04:55:33 costin Exp $ +# $Id: shutdown.sh,v 1.4 2001/09/17 04:59:32 costin Exp $ # Shell script to shutdown the server BASEDIR=`dirname $0` -$BASEDIR/tomcat.sh stop "$@" +$BASEDIR/tomcat.sh stop $@ 1.4 +2 -2 jakarta-tomcat/src/shell/startup.sh Index: startup.sh =================================================================== RCS file: /home/cvs/jakarta-tomcat/src/shell/startup.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- startup.sh 2001/08/22 04:55:33 1.3 +++ startup.sh 2001/09/17 04:59:32 1.4 @@ -1,9 +1,9 @@ #! /bin/sh # -# $Id: startup.sh,v 1.3 2001/08/22 04:55:33 costin Exp $ +# $Id: startup.sh,v 1.4 2001/09/17 04:59:32 costin Exp $ # Shell script to startup the server BASEDIR=`dirname $0` -$BASEDIR/tomcat.sh start "$@" +$BASEDIR/tomcat.sh start $@ 1.29 +11 -11 jakarta-tomcat/src/shell/tomcat.sh Index: tomcat.sh =================================================================== RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.sh,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- tomcat.sh 2001/09/14 04:11:20 1.28 +++ tomcat.sh 2001/09/17 04:59:32 1.29 @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: tomcat.sh,v 1.28 2001/09/14 04:11:20 costin Exp $ +# $Id: tomcat.sh,v 1.29 2001/09/17 04:59:32 costin Exp $ # Shell script to start and stop the server @@ -160,12 +160,12 @@ if [ "$1" = "-noout" ] ; then shift - $JAVACMD $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} $MAIN start "$@" >${TOMCAT_HOME}/logs/stdout.log 2>&1 & + $JAVACMD $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} $MAIN start $@ >${TOMCAT_HOME}/logs/stdout.log 2>&1 & else echo Using classpath: ${CLASSPATH} echo Using JAVA_HOME: ${JAVA_HOME} echo Using TOMCAT_HOME: ${TOMCAT_HOME} - $JAVACMD $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} $MAIN start "$@" & + $JAVACMD $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} $MAIN start $@ & fi @@ -190,7 +190,7 @@ echo Using classpath: ${CLASSPATH} echo Using JAVA_HOME: ${JAVA_HOME} echo Using TOMCAT_HOME: ${TOMCAT_HOME} - $JAVACMD $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} $MAIN stop "$@" + $JAVACMD $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} $MAIN stop $@ if [ "$1" = "-force" ] ; then shift @@ -202,26 +202,26 @@ shift # Backward compat if [ "$1" = "enableAdmin" ] ; then - $JAVACMD $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} $MAIN enableAdmin "$@" + $JAVACMD $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} $MAIN enableAdmin $@ elif [ "$1" = "-enableAdmin" ] ; then - $JAVACMD $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} $MAIN enableAdmin "$@" + $JAVACMD $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} $MAIN enableAdmin $@ else echo Using classpath: ${CLASSPATH} echo Using JAVA_HOME: ${JAVA_HOME} echo Using TOMCAT_HOME: ${TOMCAT_HOME} - $JAVACMD $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} $MAIN start "$@" + $JAVACMD $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} $MAIN start $@ fi elif [ "$1" = "enableAdmin" ] ; then - $JAVACMD $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} $MAIN enableAdmin "$@" + $JAVACMD $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} $MAIN enableAdmin $@ elif [ "$1" = "estart" ] ; then - $JAVACMD $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} $MAIN estart "$@" + $JAVACMD $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} $MAIN estart $@ elif [ "$1" = "jspc" ] ; then shift - $JAVACMD $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} $MAIN jspc "$@" + $JAVACMD $TOMCAT_OPTS -Dtomcat.home=${TOMCAT_HOME} $MAIN jspc $@ elif [ "$1" = "jspcOrig" ] ; then shift @@ -239,7 +239,7 @@ if [ "$oldCP" != "" ]; then CLASSPATH=${CLASSPATH}:${oldCP} fi - (cd $TOMCAT_HOME; $JAVACMD $JSPC_OPTS -Dtomcat.home=${TOMCAT_HOME} org.apache.jasper.JspC "$@" ) + (cd $TOMCAT_HOME; $JAVACMD $JSPC_OPTS -Dtomcat.home=${TOMCAT_HOME} org.apache.jasper.JspC $@ ) elif [ "$1" = "env" ] ; then ## Call it with source tomcat.sh to set the env for tomcat