Return-Path: <glenn@locus.apache.org>
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 73324 invoked by uid 500); 17 Nov 2000 22:05:51 -0000
Delivered-To: apmail-jakarta-tomcat-cvs@apache.org
Received: (qmail 73320 invoked by uid 1004); 17 Nov 2000 22:05:51 -0000
Date: 17 Nov 2000 22:05:51 -0000
Message-ID: <20001117220551.73318.qmail@locus.apache.org>
From: glenn@locus.apache.org
To: jakarta-tomcat-cvs@apache.org
Subject: cvs commit: jakarta-tomcat/src/shell tomcat.sh

glenn       00/11/17 14:05:50

  Modified:    src/shell Tag: tomcat_32 tomcat.sh
  Log:
  Remove current directory from CLASSPATH
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.17.2.1  +7 -4      jakarta-tomcat/src/shell/tomcat.sh
  
  Index: tomcat.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/shell/tomcat.sh,v
  retrieving revision 1.17
  retrieving revision 1.17.2.1
  diff -u -r1.17 -r1.17.2.1
  --- tomcat.sh	2000/05/26 18:55:33	1.17
  +++ tomcat.sh	2000/11/17 22:05:50	1.17.2.1
  @@ -1,6 +1,6 @@
   #!/bin/sh
   #
  -# $Id: tomcat.sh,v 1.17 2000/05/26 18:55:33 costin Exp $
  +# $Id: tomcat.sh,v 1.17.2.1 2000/11/17 22:05:50 glenn Exp $
   
   # Shell script to start and stop the server
   
  @@ -87,12 +87,15 @@
      JAVACMD=$JAVA_HOME/bin/java
   fi
   
  -
   oldCP=$CLASSPATH
    
  -CLASSPATH=.
  +unset CLASSPATH
   for i in ${TOMCAT_HOME}/lib/* ; do
  -  CLASSPATH=${CLASSPATH}:$i
  +  if [ "$CLASSPATH" != "" ]; then
  +    CLASSPATH=${CLASSPATH}:$i
  +  else
  +    CLASSPATH=$i
  +  fi
   done
   
   if [ -f ${JAVA_HOME}/lib/tools.jar ] ; then