tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject svn commit: r586522 - /tomcat/tc6.0.x/trunk/STATUS
Date Fri, 19 Oct 2007 16:32:56 GMT
Author: remm
Date: Fri Oct 19 09:32:52 2007
New Revision: 586522

URL: http://svn.apache.org/viewvc?rev=586522&view=rev
Log:
- Propose a shell script update v2 (but it's better to ignore it, JF told me he would do something
better
  later).

Modified:
    tomcat/tc6.0.x/trunk/STATUS

Modified: tomcat/tc6.0.x/trunk/STATUS
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS?rev=586522&r1=586521&r2=586522&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS (original)
+++ tomcat/tc6.0.x/trunk/STATUS Fri Oct 19 09:32:52 2007
@@ -36,8 +36,10 @@
   available in /usr. As a result, it could now be possible to use a "/usr/bin/java" binary
   if one is present and expect results. [tested on Fedora 8 test 3]
 
---- bin/setclasspath.sh	(revision 585189)
-+++ bin/setclasspath.sh	(working copy)
+Index: /home/remm/Work/eclipse/jbossweb-2.1.x/apache-tomcat-6.0.x/bin/setclasspath.sh
+===================================================================
+--- /home/remm/Work/eclipse/jbossweb-2.1.x/apache-tomcat-6.0.x/bin/setclasspath.sh	(revision
586293)
++++ /home/remm/Work/eclipse/jbossweb-2.1.x/apache-tomcat-6.0.x/bin/setclasspath.sh	(working
copy)
 @@ -30,9 +30,13 @@
    if $darwin && [ -d "/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home"
]; then
      export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home"
@@ -45,12 +47,12 @@
 -    echo "Neither the JAVA_HOME nor the JRE_HOME environment variable is defined"
 -    echo "At least one of these environment variable is needed to run this program"
 -    exit 1
-+    if [ ! -x /usr/bin/java ]; then
++    if [ -x /usr/bin/java ]; then
++      JRE_HOME=/usr
++    else
 +      echo "Neither the JAVA_HOME nor the JRE_HOME environment variable is defined"
 +      echo "At least one of these environment variable is needed to run this program"
 +      exit 1
-+    else
-+      JRE_HOME=/usr
 +    fi
    fi
  fi



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


Mime
View raw message