[Lunar-commits] r23915 - moonbase/trunk/compilers/sun-jdk

[Stefan Wold]

Author: ratler
Date: 2007-04-04 17:01:20 +0200 (Wed, 04 Apr 2007)
New Revision: 23915

Modified:
   moonbase/trunk/compilers/sun-jdk/BUILD
Log:
Conflicting files with heimdal. I also believe symlinking java stuff into /usr/bin is a bad idea. All java apps should honor JAVA_HOME

Modified: moonbase/trunk/compilers/sun-jdk/BUILD
===================================================================
--- moonbase/trunk/compilers/sun-jdk/BUILD	2007-04-04 11:59:30 UTC (rev 23914)
+++ moonbase/trunk/compilers/sun-jdk/BUILD	2007-04-04 15:01:20 UTC (rev 23915)
@@ -9,7 +9,13 @@
   cp -r $SOURCE_DIRECTORY/jdk${VERSION} /usr/lib/ &&
 
   # Some applications don't accept anything but /usr/bin
-  for file in /usr/lib/jdk${VERSION}/bin/*; do ln -sf $file /usr/bin/; done
+  for file in /usr/lib/jdk${VERSION}/bin/*; do 
+      bfile=`basename $file`
+      # Conflicting files with heimdal
+      if [[ "$bfile" != "klist" ]] && [[ "$bfile" != "kinit" ]]; then
+	  ln -sf $file /usr/bin/
+      fi
+  done
 
   mkdir -p /opt/lunar/plugins &&
   rm -f /opt/lunar/plugins/libjavaplugin_oji.so &&