[pkg-java] r2771 - branches/tomcat5.5/feature/debian/container/catalina/src/bin

[Marcus Better]

Author: marcusb-guest
Date: 2006-11-20 12:18:53 +0100 (Mon, 20 Nov 2006)
New Revision: 2771

Modified:
   branches/tomcat5.5/feature/debian/container/catalina/src/bin/catalina.sh
Log:
Use correct conditional operators.


Modified: branches/tomcat5.5/feature/debian/container/catalina/src/bin/catalina.sh
===================================================================
--- branches/tomcat5.5/feature/debian/container/catalina/src/bin/catalina.sh	2006-11-19 18:08:38 UTC (rev 2770)
+++ branches/tomcat5.5/feature/debian/container/catalina/src/bin/catalina.sh	2006-11-20 11:18:53 UTC (rev 2771)
@@ -121,7 +121,7 @@
 fi
 
 # Add on extra jar files to CLASSPATH
-if [ -n "$JSSE_HOME" -a "$gcj" -ne "yes" ]; then
+if [ -n "$JSSE_HOME" -a "$gcj" != "yes" ]; then
   CLASSPATH="$CLASSPATH":"$JSSE_HOME"/lib/jcert.jar:"$JSSE_HOME"/lib/jnet.jar:"$JSSE_HOME"/lib/jsse.jar
 fi
 CLASSPATH="$CLASSPATH":"$CATALINA_HOME"/bin/bootstrap.jar:"$CATALINA_HOME"/bin/commons-logging-api.jar
@@ -154,7 +154,7 @@
 fi
 
 # juli LogManager disabled if running under libgcj (see bug #395167)
-if [ -r "$CATALINA_HOME"/bin/tomcat-juli.jar -a "$gcj" -ne "yes" ]; then
+if [ -r "$CATALINA_HOME"/bin/tomcat-juli.jar -a "$gcj" != "yes" ]; then
   JAVA_OPTS="$JAVA_OPTS "-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager" "-Djava.util.logging.config.file="$CATALINA_BASE/conf/logging.properties"
 fi