--- App-Staticperl/staticperl.sh	2011/05/01 07:56:26	1.40
+++ App-Staticperl/staticperl.sh	2011/06/27 21:56:41	1.47
@@ -1,11 +1,12 @@
 #!/bin/sh
 
 #############################################################################
-# configuration to fill in
+# configuration to fill in (or to replace in your .staticperlrc)
 
 STATICPERL=~/.staticperl
 CPAN=http://mirror.netcologne.de/cpan # which mirror to use
 EMAIL="read the documentation <rtfm@example.org>"
+DLCACHE=
 
 # perl build variables
 MAKE=make
@@ -39,8 +40,8 @@
 PERL_MM_USE_DEFAULT=1
 PERL_MM_OPT="MAN1PODS= MAN3PODS="
 #CORO_INTERFACE=p # needed without nptl on x86, due to bugs in linuxthreads - very slow
-EV_EXTRA_DEFS='-DEV_FEATURES=4+8+16+64 -DEV_USE_SELECT=0 -DEV_USE_POLL=1 -DEV_USE_EPOLL=1 -DEV_NO_LOOPS -DEV_COMPAT3=0'
-export PERL_MM_USE_DEFAULT PERL_MM_OPT CORO_INTERFACE EV_EXTRA_DEFS
+#EV_EXTRA_DEFS='-DEV_FEATURES=4+8+16+64 -DEV_USE_SELECT=0 -DEV_USE_POLL=1 -DEV_USE_EPOLL=1 -DEV_NO_LOOPS -DEV_COMPAT3=0'
+export PERL_MM_USE_DEFAULT PERL_MM_OPT
 
 # which extra modules to install by default from CPAN that are
 # required by mkbundle
@@ -80,7 +81,7 @@
 
 # set version in a way that Makefile.PL can extract
 VERSION=VERSION; eval \
-$VERSION="1.21"
+$VERSION="1.31"
 
 BZ2=bz2
 BZIP2=bzip2
@@ -149,23 +150,36 @@
    rcd src
 
    if ! [ -d "perl-$PERL_VERSION" ]; then
-      if ! [ -e "perl-$PERL_VERSION.tar.$BZ2" ]; then
+      PERLTAR=perl-$PERL_VERSION.tar.$BZ2
 
-         URL="$CPAN/src/5.0/perl-$PERL_VERSION.tar.$BZ2"
+      if ! [ -e $PERLTAR ]; then
+         URL="$CPAN/src/5.0/$PERLTAR"
 
          verblock <<EOF
 downloading perl
 to manually download perl yourself, place
 perl-$PERL_VERSION.tar.$BZ2 in $STATICPERL
 trying $URL
+
+either curl or wget is required for automatic download.
+curl is tried first, then wget.
+
+you can configure a download cache directory via DLCACHE
+in your .staticperlrc to avoid repeated downloads.
 EOF
 
-         rm -f perl-$PERL_VERSION.tar.$BZ2~ # just to be on the safe side
-         curl -f >perl-$PERL_VERSION.tar.$BZ2~ "$URL" \
-            || wget -O perl-$PERL_VERSION.tar.$BZ2~ "$URL" \
+         rm -f $PERLTAR~ # just to be on the safe side
+         { [ "$DLCACHE" ] && cp "$DLCACHE"/$PERLTAR $PERLTAR~; } \
+            || wget -O $PERLTAR~ "$URL" \
+            || curl -f >$PERLTAR~ "$URL" \
             || fatal "$URL: unable to download"
-         rm -f perl-$PERL_VERSION.tar.$BZ2
-         mv perl-$PERL_VERSION.tar.$BZ2~ perl-$PERL_VERSION.tar.$BZ2
+         rm -f $PERLTAR
+         mv $PERLTAR~ $PERLTAR
+         if [ "$DLCACHE" ]; then
+            mkdir -p "$DLCACHE"
+            cp $PERLTAR "$DLCACHE"/$PERLTAR~ && \
+               mv "$DLCACHE"/$PERLTAR~ "$DLCACHE"/$PERLTAR
+         fi
       fi
 
       verblock <<EOF
@@ -174,8 +188,8 @@
 
       mkdir -p unpack
       rm -rf unpack/perl-$PERL_VERSION
-      $BZIP2 -d <perl-$PERL_VERSION.tar.$BZ2 | ( cd unpack && tar xf - ) \
-         || fatal "perl-$PERL_VERSION.tar.$BZ2: error during unpacking"
+      $BZIP2 -d <$PERLTAR | ( cd unpack && tar xf - ) \
+         || fatal "$PERLTAR: error during unpacking"
       chmod -R u+w unpack/perl-$PERL_VERSION
       mv unpack/perl-$PERL_VERSION perl-$PERL_VERSION
       rmdir -p unpack