[Lunar-commits] r22331 - moonbase/trunk/compilers/sun-jre

[striker]

Author: striker
Date: 2006-11-27 18:20:35 +0100 (Mon, 27 Nov 2006)
New Revision: 22331

Modified:
   moonbase/trunk/compilers/sun-jre/BUILD
   moonbase/trunk/compilers/sun-jre/DETAILS
Log:
- fixed URL to the official location, with a tweak to make it REALLY work.
- applied sofar's suggested changes to BUILD
- changed -a to -r to stop potential permission issue


Modified: moonbase/trunk/compilers/sun-jre/BUILD
===================================================================
--- moonbase/trunk/compilers/sun-jre/BUILD	2006-11-27 16:21:55 UTC (rev 22330)
+++ moonbase/trunk/compilers/sun-jre/BUILD	2006-11-27 17:20:35 UTC (rev 22331)
@@ -5,20 +5,12 @@
 
   prepare_install  &&
 
-  cp -a $SOURCE_DIRECTORY/jre${VERSION} /usr/lib/ &&
+  cp -r $SOURCE_DIRECTORY/jre${VERSION} /usr/lib/ &&
 
-  if [ ! -d /opt/lunar/plugins ] ; then
-    mkdir -p /opt/lunar/plugins;
-    ln -sf /usr/lib/jre${VERSION}/plugin/i386/ns7/libjavaplugin_oji.so \
-           /opt/lunar/plugins/;
-  elif [ ! -x /opt/lunar/plugins/libjavaplugin_oji.so ] ; then
-    ln -sf /usr/lib/jre${VERSION}/plugin/i386/ns7/libjavaplugin_oji.so \
-           /opt/lunar/plugins/;
-  else
-    rm -f /opt/lunar/plugins/libjavaplugin_oji.so;
-    ln -sf /usr/lib/jre${VERSION}/plugin/i386/ns7/libjavaplugin_oji.so \
-           /opt/lunar/plugins/;
-  fi &&
+  mkdir -p /opt/lunar/plugins
+  rm -f /opt/lunar/plugins/libjavaplugin_oji.so
+  ln -sf /usr/lib/jre${VERSION}/plugin/i386/ns7/libjavaplugin_oji.so \
+         /opt/lunar/plugins/
 
   echo export PATH=\"/usr/lib/jre"${VERSION}"/bin:'${PATH}'\" >> $SOURCE_DIRECTORY/sun-jre.rc &&
 

Modified: moonbase/trunk/compilers/sun-jre/DETAILS
===================================================================
--- moonbase/trunk/compilers/sun-jre/DETAILS	2006-11-27 16:21:55 UTC (rev 22330)
+++ moonbase/trunk/compilers/sun-jre/DETAILS	2006-11-27 17:20:35 UTC (rev 22331)
@@ -1,12 +1,13 @@
           MODULE=sun-jre
          VERSION=1.5.0_09
           SOURCE=jre-1_5_0_09-linux-i586.bin
-      SOURCE_URL=http://download.lunar-linux.org/lunar/mirrors/
+      SOURCE_URL="http://jdl.sun.com/webapps/download/AutoDL?BundleId=10744&garbage="
       SOURCE_VFY=sha1:cba95dc4107d8217ccc0dedf5ff7e337efc7f3c3
         WEB_SITE=http://java.sun.com
          LICENSE="proprietary"
          ENTERED=20061113
          UPDATED=20061113
+           FUZZY=off
        LDD_CHECK=off
            SHORT="SUN java runtime environment"
 cat << EOF