cvs commit: jakarta-tomcat-4.0/catalina/src/bin catalina.sh

[jon]

jon         00/12/15 19:33:09

  Modified:    catalina/src/bin catalina.sh
  Log:
  clean some stuff up
  start to add in cygwin support
  
  NOTE: tomcat still cannot startup properly under cygwin! UG!!!!
  i will post a stack trace in another email.
  
  Revision  Changes    Path
  1.12      +15 -8     jakarta-tomcat-4.0/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/bin/catalina.sh,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- catalina.sh       2000/12/14 20:44:15     1.11
  +++ catalina.sh       2000/12/16 03:33:09     1.12
  @@ -12,13 +12,13 @@
   #
   #   JAVA_HOME     Must point at your Java Development Kit installation.
   #
  -# $Id: catalina.sh,v 1.11 2000/12/14 20:44:15 craigmcc Exp $
  +# $Id: catalina.sh,v 1.12 2000/12/16 03:33:09 jon Exp $
   # -----------------------------------------------------------------------------
   
   
   # ----- Verify and Set Required Environment Variables -------------------------
   
  -if [ "$CATALINA_HOME" = "" ] ; then
  +if [ -z "$CATALINA_HOME" ] ; then
     ## resolve links - $0 may be a link to  home
     PRG=$0
     progname=`basename $0`
  @@ -41,24 +41,31 @@
       fi
   fi
   
  -if [ "$CATALINA_OPTS" = "" ] ; then
  +if [ -z "$CATALINA_OPTS" ] ; then
     CATALINA_OPTS=""
   fi
   
  -if [ "$JAVA_HOME" = "" ] ; then
  +if [ -z "$JAVA_HOME" ] ; then
     echo You must set JAVA_HOME to point at your Java Development Kit installation
     exit 1
   fi
   
   # ----- Set Up The System Classpath -------------------------------------------
   
  
-CP=$CATALINA_HOME/bin/bootstrap.jar:$CATALINA_HOME/bin/servlet.jar:$CATALINA_HOME/bin/naming.jar
  
+CP="$CATALINA_HOME/bin/bootstrap.jar:$CATALINA_HOME/bin/servlet.jar:$CATALINA_HOME/bin/naming.jar"
   
  -if [ -f $JAVA_HOME/lib/tools.jar ] ; then
  -  CP=$CP:$JAVA_HOME/lib/tools.jar
  +if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
  +  CP=$CP:"$JAVA_HOME/lib/tools.jar"
   fi
   
  -echo Using CLASSPATH: $CP
  +# convert the existing path to windows
  +if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ] ; then
  +   CP=`cygpath --path --windows "$CP"`
  +   CATALINA_HOME=`cygpath --path --windows "$CATALINA_HOME"`
  +fi
  +
  +echo "Using CLASSPATH: $CP"
  +echo "Using CATALINA_HOME: $CATALINA_HOME"
   
   
   # ----- Execute The Requested Command -----------------------------------------