remove sed test garbage left behind on some hosts with an old/unsupported sed

[openwrt/staging/dedeckeh.git] / openwrt / scripts / download.pl

diff --git a/openwrt/scripts/download.pl b/openwrt/scripts/download.pl
index 43dc7965b87e50f219080d8e22f3ad33227e5784..f636cca7eb3fa1d9d4c7128cc6b7f513d46a22b3 100755 (executable)
--- a/openwrt/scripts/download.pl
+++ b/openwrt/scripts/download.pl
@@ -1,4 +1,11 @@
 #!/usr/bin/perl
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
 use strict;
 use warnings;
 
@@ -11,12 +18,17 @@ my $ok;
 
 @ARGV > 0 or die "Syntax: $0 <target dir> <filename> <md5sum> <mirror> [<mirror> ...]\n";
 
+my $md5cmd = `which md5sum`;
+$md5cmd or $md5cmd = `which md5`;
+$md5cmd or die 'no md5 checksum program found, please install md5 or md5sum';
+chomp $md5cmd;
+
 sub download
 {
        my $mirror = shift;
-       
+
        open WGET, "wget -t1 --timeout=20 -O- \"$mirror/$filename\" |" or die "Cannot launch wget.\n";
-       open MD5SUM, "| md5sum > \"$target/$filename.md5sum\"" or die "Cannot launch md5sum.\n";
+       open MD5SUM, "| $md5cmd > \"$target/$filename.md5sum\"" or die "Cannot launch md5sum.\n";
        open OUTPUT, "> $target/$filename.dl" or die "Cannot create file $target/$filename.dl: $!\n";
        my $buffer;
        while (read WGET, $buffer, 1048576) {
@@ -34,7 +46,7 @@ sub download
        }
        
        my $sum = `cat "$target/$filename.md5sum"`;
-       $sum =~ /^(\w+)\s+/ or die "Could not generate md5sum\n";
+       $sum =~ /^(\w+)\s*/ or die "Could not generate md5sum\n";
        $sum = $1;
        
        if (($md5sum =~ /\w{32}/) and ($sum ne $md5sum)) {
@@ -59,10 +71,15 @@ foreach my $mirror (@ARGV) {
                my $sfpath = $1;
                open SF, "wget -t1 -q -O- 'http://prdownloads.sourceforge.net/$sfpath/$filename' |";
                while (<SF>) {
+                       /RADIO NAME=use_default VALUE=(\w+) OnClick="form\.submit\(\)">/ or
                        /type="radio" name="use_default" value="(\w+)" onclick="form\.submit\(\)"\/>/ and do {
                                push @mirrors, "http://$1.dl.sourceforge.net/sourceforge/$sfpath";
                        };
+                       /<a href="\/.+\?use_mirror=(\w+)"><b>Download/ and do {
+                               push @mirrors, "http://$1.dl.sourceforge.net/sourceforge/$sfpath";
+                       };
                }
+               push @mirrors, "http://dl.sourceforge.net/sourceforge/$sfpath";
                close SF;
        } elsif ($mirror =~ /^\@GNU\/(.+)$/) {
                my $gnupath = $1;
@@ -70,13 +87,17 @@ foreach my $mirror (@ARGV) {
                push @mirrors, "ftp://ftp.belnet.be/mirror/ftp.gnu.org/gnu/$gnupath";
                push @mirrors, "ftp://ftp.mirror.nl/pub/mirror/gnu/$gnupath";
                push @mirrors, "http://mirror.switch.ch/ftp/mirror/gnu/$gnupath";
+               push @mirrors, "ftp://ftp.uu.net/archive/systems/gnu/$gnupath";
+               push @mirrors, "ftp://ftp.eu.uu.net/pub/gnu/$gnupath";
+               push @mirrors, "ftp://ftp.leo.org/pub/comp/os/unix/gnu/$gnupath";
+               push @mirrors, "ftp://ftp.digex.net/pub/gnu/$gnupath";
        } else {
                push @mirrors, $mirror;
        }
 }
 
 #push @mirrors, 'http://mirror1.openwrt.org/';
-#push @mirrors, 'http://mirror2.openwrt.org/';
+push @mirrors, 'http://mirror2.openwrt.org/sources';
 push @mirrors, 'http://downloads.openwrt.org/sources/';
 
 while (!$ok) {