Tired of dozens of copies of openjdk-6-src-b23-05_jul_2011.tar.gz? Here's a suggestion...

[Dr Andrew John Hughes]

On 18:31 Thu 20 Oct     , Andrew Haley wrote:
> I've been looking at the way we look for drops tarballs and download
> them.  It's usually pointless for me, since I almost always have a
> copy of the tarballs on the system already.
> 

That's why we have --with-openjdk-src-zip and friends.

> I think the best way to do it is to try, in order:
> 
>   if the file is OK, don't do anything
> 
>   locate a copy of the file on the local system and hardlink to it
> 
>   locate a copy of the file on the local system and copy it
> 
>   download it from the web server
> 
> That's what this script does, and as well as being much faster it
> saves disk space.  It'll need tidying up, of course, but I think the
> idea is sound.  Comments?
> 

Seems like a good idea.

How much slower is this than just downloading the file?  I can see it
winning over a large tarball like the full OpenJDK drop but I imagine
it's closer for the drop zips.

I'd suggest expanding it to cover the other zips for consistency
(JAXP/JAXWS drops, HotSpot tarball, CACAO, JamVM).

./find-file seems wrong as it's presumably in the source directory.
So you need something like $(abs_top_srcdir)/find-file instead.

> Andrew.
> 
> 
> --- a/Makefile.am	Thu Oct 20 16:14:29 2011 +0100
> +++ b/Makefile.am	Thu Oct 20 18:28:45 2011 +0100
> @@ -888,15 +891,7 @@
>  if USE_ALT_OPENJDK_SRC_ZIP
>  	ln -sf $(ALT_OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP)
>  else
> -	if ! echo "$(OPENJDK_SHA256SUM)  $(OPENJDK_SRC_ZIP)" \
> -	  | $(SHA256SUM) --check ; \
> -	then \
> -	  if [ -e $(OPENJDK_SRC_ZIP) ] ; \
> -	  then \
> -	    mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \
> -	  fi ; \
> -	  $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) -O $(OPENJDK_SRC_ZIP); \
> -	fi
> +	./find-file $(OPENJDK_SRC_ZIP) $(OPENJDK_SHA256SUM) $(OPENJDK_URL)
>  endif
>  endif
>  endif
> diff -r 13009e3bdf2c find-file
> --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
> +++ b/find-file	Thu Oct 20 18:28:45 2011 +0100
> @@ -0,0 +1,40 @@
> +#!/bin/bash
> +
> +# USAGE find-file /path/to/dest/file/name sha256sum url
> +
> +files=$(locate `basename $1`)
> +
> +if echo "$2  $1" | sha256sum --check
> +then
> +    exit 0
> +fi
> +
> +if [ -e "$1" ]
> +then
> +    mv -f "$1" "$1.old"
> +fi
> +
> +for file in $files
> +do
> +    if (ln -f "$file" $1 && chown `whoami` $1 && echo "$2  $1" | sha256sum --check)
> +    then
> +	exit 0
> +    fi
> +    rm -f $1
> +done
> +
> +for file in $files
> +do
> +    if (cp "$file" $1 && echo "$2  $1" | sha256sum --check)
> +    then
> +	exit 0
> +    fi
> +    rm -f $1
> +done
> +
> +if wget "$3$1" -O $1
> +then
> +    exit 0
> +fi
> +
> +exit 1

-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: 248BDC07 (https://keys.indymedia.org/)
Fingerprint = EC5A 1F5E C0AD 1D15 8F1F  8F91 3B96 A578 248B DC07
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111021/046dc8f4/attachment.bin