tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From funk...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina/src/bin catalina.sh
Date Wed, 28 Jul 2004 00:47:47 GMT
funkman     2004/07/27 17:47:47

  Modified:    catalina/src/bin catalina.sh
  Log:
  BZ 29938
  Cygwin fixes
  Patch from amoebaworks at yahoo .ca
  
  Revision  Changes    Path
  1.15      +7 -7      jakarta-tomcat-catalina/catalina/src/bin/catalina.sh
  
  Index: catalina.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/catalina.sh,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- catalina.sh	30 Jun 2004 15:25:31 -0000	1.14
  +++ catalina.sh	28 Jul 2004 00:47:47 -0000	1.15
  @@ -72,7 +72,7 @@
     [ -n "$CATALINA_HOME" ] && CATALINA_HOME=`cygpath --unix "$CATALINA_HOME"`
     [ -n "$CATALINA_BASE" ] && CATALINA_BASE=`cygpath --unix "$CATALINA_BASE"`
     [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
  -  [ -n "$JSSE_HOME" ] && JSSE_HOME=`cygpath --path --unix "$JSSE_HOME"`
  +  [ -n "$JSSE_HOME" ] && JSSE_HOME=`cygpath --absolute --unix "$JSSE_HOME"`
   fi
   
   # For OS400
  @@ -114,12 +114,12 @@
   
   # For Cygwin, switch paths to Windows format before running java
   if $cygwin; then
  -  JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
  -  CATALINA_HOME=`cygpath --path --windows "$CATALINA_HOME"`
  -  CATALINA_BASE=`cygpath --path --windows "$CATALINA_BASE"`
  -  CATALINA_TMPDIR=`cygpath --path --windows "$CATALINA_TMPDIR"`
  +  JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"`
  +  CATALINA_HOME=`cygpath --absolute --windows "$CATALINA_HOME"`
  +  CATALINA_BASE=`cygpath --absolute --windows "$CATALINA_BASE"`
  +  CATALINA_TMPDIR=`cygpath --absolute --windows "$CATALINA_TMPDIR"`
     CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
  -  JSSE_HOME=`cygpath --path --windows "$JSSE_HOME"`
  +  [ -n "$JSSE_HOME" ] && JSSE_HOME=`cygpath --absolute --windows "$JSSE_HOME"`
     JAVA_ENDORSED_DIRS=`cygpath --path --windows "$JAVA_ENDORSED_DIRS"`
   fi
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message