# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1357467527 -3600
# Node ID fc2112ef8020708a834bd53032c3e383507a0f29
# Parent  ee3986615c83529e5c8284df4696ca6afcebab62
Update get-java6-jre (thanks ernia)

diff -r ee3986615c83 -r fc2112ef8020 get-java6-jre/stuff/get-java6-jre
--- a/get-java6-jre/stuff/get-java6-jre	Wed Jan 02 22:12:19 2013 +0000
+++ b/get-java6-jre/stuff/get-java6-jre	Sun Jan 06 11:18:47 2013 +0100
@@ -1,17 +1,21 @@
 #!/bin/sh 
 # Get and install the SUN Java Runtime Environnement
 #
-# (C) 2007-2008 SliTaz - GNU General Public License v3.
+# (C) 2007-2012 SliTaz - GNU General Public License v3.
 #
 # Author : Eric Joseph-Alexandre <erjo@slitaz.org>
 
 PACKAGE="java6-jre"
-VERSION="1.6.0_31"
-URL="http://javadl.sun.com/webapps/download/AutoDL?BundleId=59621"
-TARBALL="jre-6u31-linux-i586.bin"
+WEB_SITE="http://www.java.com/"
+SHORT_DESC="SUN Java Runtime."
+DEPENDS="xorg-libXtst"
+TARBALL="jre.bin"
 TEMP_DIR="/tmp/$PACKAGE.$$"
 ROOT="$1"
 
+URL="$(wget -O - ${WEB_SITE}en/download/manual_v6.jsp | \
+       sed '/self-extracting/!d;s/.*href="\([^"]*\).*/\1/;q')"
+
 # Check if we are root starting anything
 if test $(id -u) != 0 ; then
 	echo -e "\nYou must be root to run `basename $0`."
@@ -46,10 +50,11 @@
 
 # Run the install file user may agree to SUN EULA
 chmod +x  $TARBALL
-./${TARBALL}
+tar xvf ${TARBALL}
 
 
 # Make the package
+VERSION="$(ls jre?.* -d | sed 's/^jre//')"
 mkdir -p $PACKAGE-$VERSION/fs/usr/lib/java 
 # use mv instead of 'cp -a' to save RAM
 mv jre${VERSION} $PACKAGE-$VERSION/fs/usr/lib/java
@@ -68,14 +73,14 @@
 PACKAGE="$PACKAGE"
 VERSION="$VERSION"
 CATEGORY="non-free"
-SHORT_DESC="SUN Java Runtime."
-DEPENDS="xorg-libXtst"
-WEB_SITE="http://www.java.com/"
+SHORT_DESC="$SHORT_DESC"
+DEPENDS="$DEPENDS"
+WEB_SITE="$WEB_SITE"
 
 post_install()
 {
 	echo -n "Processing post install commands..."
-	 [ -d /usr/lib/mozilla/plugins ] || mkdir -p /usr/lib/mozilla/plugins 
+	[ -d /usr/lib/mozilla/plugins ] || mkdir -p /usr/lib/mozilla/plugins 
 	ln -s /usr/lib/java/jre\$VERSION/lib/i386/libnpjp2.so /usr/lib/mozilla/plugins
 
 	cd /usr/bin
@@ -98,6 +103,9 @@
 
 # Install pseudo package
 tazpkg install $PACKAGE-$VERSION.tazpkg --root=$ROOT
+case " $@ " in
+*\ --k*) mv $PACKAGE-$VERSION.tazpkg $CUR_DIR ;;
+esac
 
 # Clean
 cd $CUR_DIR