rpms/tomcat5/devel tomcat5-5.5-catalina.sh.patch,1.4,1.5

[Andrew Overholt (overholt)]

Author: overholt

Update of /cvs/pkgs/rpms/tomcat5/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30992

Modified Files:
	tomcat5-5.5-catalina.sh.patch 
Log Message:
New catalina.sh patch that applies with no fuzz.

tomcat5-5.5-catalina.sh.patch:

Index: tomcat5-5.5-catalina.sh.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tomcat5/devel/tomcat5-5.5-catalina.sh.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tomcat5-5.5-catalina.sh.patch	5 Jan 2008 12:28:57 -0000	1.4
+++ tomcat5-5.5-catalina.sh.patch	14 Jul 2008 14:57:09 -0000	1.5
@@ -1,6 +1,6 @@
---- container/catalina/src/bin/catalina.sh.sav	2006-03-23 17:04:08.000000000 +0100
-+++ container/catalina/src/bin/catalina.sh	2006-03-23 17:12:52.000000000 +0100
-@@ -52,6 +52,11 @@
+--- container/catalina/src/bin/catalina.sh.sav	2008-07-14 10:48:13.000000000 -0400
++++ container/catalina/src/bin/catalina.sh	2008-07-14 10:51:27.000000000 -0400
+@@ -64,6 +64,11 @@
  Darwin*) darwin=true;;
  esac
  
@@ -12,7 +12,7 @@
  # resolve links - $0 may be a softlink
  PRG="$0"
  
-@@ -97,30 +100,73 @@
+@@ -111,30 +116,73 @@
    export QIBM_MULTI_THREADED=Y
  fi
  
@@ -35,8 +35,8 @@
 -  fi
 +if [ -z "$CATALINA_HOME" ]; then
 +    [ -r "$TOMCAT_CFG" ] && . "${TOMCAT_CFG}"
-+fi
-+
+ fi
+ 
 +### Set up defaults if they were omitted in TOMCAT_CFG
 +###  JVM lookup
 +if [ -z "$JAVA_HOME" ]; then
@@ -79,8 +79,8 @@
 +        echo "Found JAVA_HOME: ${JAVA_HOME}"
 +        echo "Please complete your ${TOMCAT_CFG} so we won't have to look for it next time"
 +    fi
- fi
- 
++fi
++
 +# Set standard commands for invoking Java.
 +_RUNJAVA="$JAVA_HOME"/bin/java
 +_RUNJAVAC="$JAVA_HOME"/bin/javac
@@ -104,7 +104,7 @@
  
  if [ -z "$CATALINA_BASE" ] ; then
    CATALINA_BASE="$CATALINA_HOME"
-@@ -131,6 +179,10 @@
+@@ -145,6 +193,10 @@
    CATALINA_TMPDIR="$CATALINA_BASE"/temp
  fi
  
@@ -112,10 +112,10 @@
 +    export CATALINA_PID=/var/run/tomcat5.pid
 +fi
 +
- # For Cygwin, switch paths to Windows format before running java
- if $cygwin; then
-   JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"`
-@@ -290,7 +342,7 @@
+ # Bugzilla 37848: When no TTY is available, don't output to console
+ have_tty=0
+ if [ "`tty`" != "not a tty" ]; then
+@@ -318,7 +370,7 @@
  
  else