[Lunar-commits] <moonbase> sun-jdk: added support for new java plugin for Firefox3 only. If you use other web browser keep using old plugin.

[Zbigniew Luszpinski]

commit 9e962f476a28fb4ad6c8df3804d414a93f637555
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Fri Nov 7 03:53:52 2008 +0100

    sun-jdk: added support for new java plugin for Firefox3 only. If you use other web browser keep using old plugin.
---
 compilers/sun-jdk/BUILD       |   13 ++++++++-----
 compilers/sun-jdk/CONFIGURE   |    1 +
 compilers/sun-jdk/POST_REMOVE |    1 +
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/compilers/sun-jdk/BUILD b/compilers/sun-jdk/BUILD
index fcc7946..b676b61 100644
--- a/compilers/sun-jdk/BUILD
+++ b/compilers/sun-jdk/BUILD
@@ -1,11 +1,7 @@
 (
-
   chmod +x $SOURCE &&
   ./$SOURCE --accept-license --unpack &&
 
-  # Clean up before install (fixes nested symlinks problem)
-  rm -rf /usr/lib/jdk1.6.0_*
-
   prepare_install &&
 
   cp -r $SOURCE_DIRECTORY/jdk${VERSION} /usr/lib/ &&
@@ -25,8 +21,15 @@
 
   mkdir -p /opt/lunar/plugins &&
   rm -f /opt/lunar/plugins/libjavaplugin_oji.so &&
+  rm -f /opt/lunar/plugins/libnpjp2.so &&
+
+  if [ $NEWPLUGIN == 'y' ]; then
+  ln -sf /usr/lib/jdk${VERSION}/jre/lib/i386/libnpjp2.so \
+         /opt/lunar/plugins/
+  else
   ln -sf /usr/lib/jdk${VERSION}/jre/plugin/i386/ns7/libjavaplugin_oji.so \
-         /opt/lunar/plugins/ &&
+         /opt/lunar/plugins/
+  fi &&
 
 
   echo export PATH=\"'${PATH}':/usr/lib/jdk"${VERSION}"/bin\" >> $SOURCE_DIRECTORY/sun-jdk.rc &&
diff --git a/compilers/sun-jdk/CONFIGURE b/compilers/sun-jdk/CONFIGURE
new file mode 100644
index 0000000..6b46697
--- /dev/null
+++ b/compilers/sun-jdk/CONFIGURE
@@ -0,0 +1 @@
+ mquery NEWPLUGIN "Use new web browser plugin instead of old one ? (Yes if you use only firefox3 or need to run new applets)" n
diff --git a/compilers/sun-jdk/POST_REMOVE b/compilers/sun-jdk/POST_REMOVE
new file mode 100644
index 0000000..8c37382
--- /dev/null
+++ b/compilers/sun-jdk/POST_REMOVE
@@ -0,0 +1 @@
+rm -rf /usr/lib/jdk${VERSION}_*