r2048 - in trunk/eclipse/debian: . extra

[Matthias Klose]

Author: doko
Date: 2006-04-17 17:02:17 +0000 (Mon, 17 Apr 2006)
New Revision: 2048

Modified:
   trunk/eclipse/debian/changelog
   trunk/eclipse/debian/extra/ecj.sh
Log:
* ecj.sh: Only access /etc/eclipse/java_home, if it exists. Closes: #356027.


Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog	2006-04-17 16:58:50 UTC (rev 2047)
+++ trunk/eclipse/debian/changelog	2006-04-17 17:02:17 UTC (rev 2048)
@@ -21,6 +21,7 @@
   * debian/eclipse.menu: Set longtitle. Ubuntu #34916.
   * Move swt.jar into the libswt3.1-gtk-java package. Closes: #362991.
   * Add a new package libswt3.1-gtk-gcj.
+  * ecj.sh: Only access /etc/eclipse/java_home, if it exists. Closes: #356027.
 
  -- Michael Koch <konqueror at gmx.de>  Wed, 15 Mar 2006 17:03:01 +0000
 

Modified: trunk/eclipse/debian/extra/ecj.sh
===================================================================
--- trunk/eclipse/debian/extra/ecj.sh	2006-04-17 16:58:50 UTC (rev 2047)
+++ trunk/eclipse/debian/extra/ecj.sh	2006-04-17 17:02:17 UTC (rev 2048)
@@ -30,7 +30,7 @@
 
 # If the user has not set JAVA_HOME, cycle through our list of compatible VM's
 # and pick the first one that exists.
-if [ -z "$JAVA_HOME" ]; then
+if [ -z "$JAVA_HOME" ] && [ -f /etc/eclipse/java_home ]; then
     while read JAVA_HOME; do
         echo -n "  testing $JAVA_HOME..."
         if [ -x "$JAVA_HOME"/bin/java ]; then