CVS eclipse/debian/extra

[Michael Koch]

Update of /cvsroot/pkg-java/eclipse/debian/extra
In directory haydn:/tmp/cvs-serv27075/extra

Modified Files:
	eclipse.sh 
Log Message:
* debian/eclipse-platform.preinst: Make /usr/lib/eclipse/features a real
  directory. Closes: #345724, #345749
* debian/extra/eclipse.sh: Fixed handling of /etc/eclipse/java_home.
  Closes: #345756, #346110


--- /cvsroot/pkg-java/eclipse/debian/extra/eclipse.sh	2005/12/18 09:21:54	1.6
+++ /cvsroot/pkg-java/eclipse/debian/extra/eclipse.sh	2006/01/07 09:33:31	1.7
@@ -65,8 +65,10 @@
 # and pick the first one that exists.
 if [ -z "${JAVA_HOME}" ]; then
     echo "searching for compatible vm..."
-    cat /etc/eclipse/java_home | grep -v '^#' | grep -v '^$' | \
-    while read JAVA_HOME; do
+    javahomelist=`cat /etc/eclipse/java_home  | grep -v '^#' | grep -v '^$' | while read line ; do echo -n $line ; echo -n ":" ; done`
+    OFS="$IFS"
+    IFS=":"
+    for JAVA_HOME in $javahomelist ; do
         echo -n "  testing ${JAVA_HOME}..."
         if [ -x "${JAVA_HOME}/bin/java" ]; then
             export JAVA_HOME
@@ -76,6 +78,7 @@
             echo "not found"
         fi
     done
+    IFS="$OFS"
 fi
 
 # If we don't have a JAVA_HOME yet, we're doomed.