# HG changeset patch # User Richard Dunbar # Date 1337118057 0 # Node ID 9836643962d11ed90904cb1a69ed6e3b749efde1 # Parent fa56b3d2ddf64d9283c611b32bec6e532ce5b952 get-java6-jre: fix generic with tar diff -r fa56b3d2ddf6 -r 9836643962d1 get-java6-jre/stuff/get-java6-jre --- a/get-java6-jre/stuff/get-java6-jre Tue May 15 14:36:55 2012 +0000 +++ b/get-java6-jre/stuff/get-java6-jre Tue May 15 21:40:57 2012 +0000 @@ -1,17 +1,19 @@ #!/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 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/" +TARBALL="jre.tar.gz" TEMP_DIR="/tmp/$PACKAGE.$$" ROOT="$1" +URL="$(wget -O - ${WEB_SITE}en/download/manual.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 +48,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 @@ -70,7 +73,7 @@ CATEGORY="non-free" SHORT_DESC="SUN Java Runtime." DEPENDS="xorg-libXtst" -WEB_SITE="http://www.java.com/" +WEB_SITE="$WEB_SITE" post_install() { @@ -98,6 +101,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