add a load of fixes from whiterussian to head

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

diff --git a/openwrt/scripts/download.pl b/openwrt/scripts/download.pl
index 607a9bd..08caa03 100755 (executable)
--- a/openwrt/scripts/download.pl
+++ b/openwrt/scripts/download.pl
@@ -5,13 +5,11 @@ use warnings;
 my $target = shift @ARGV;
 my $filename = shift @ARGV;
 my $md5sum = shift @ARGV;
 my $target = shift @ARGV;
 my $filename = shift @ARGV;
 my $md5sum = shift @ARGV;

-my @mirrors = @ARGV;
+my @mirrors;

 
 my $ok;
 
 
 my $ok;
 

-@mirrors > 0 or die "Syntax: $0 <target dir> <filename> <md5sum> <mirror> [<mirror> ...]\n";
-
-push @mirrors, 'http://openwrt.inf.fh-brs.de/mirror';
+@ARGV > 0 or die "Syntax: $0 <target dir> <filename> <md5sum> <mirror> [<mirror> ...]\n";

 
 sub download
 {
 
 sub download
 {


@@ -56,10 +54,7 @@ sub cleanup
        unlink "$target/$filename.md5sum";
 }
 
        unlink "$target/$filename.md5sum";
 }
 

-while (!$ok) {
-       my $mirror = shift @mirrors;
-       $mirror or die "No more mirrors to try - giving up.\n";
-       
+foreach my $mirror (@ARGV) {

        if ($mirror =~ /^\@SF\/(.+)$/) {
                my $sfpath = $1;
                open SF, "wget -t1 -q -O- 'http://prdownloads.sf.net/$sfpath/$filename' |";
        if ($mirror =~ /^\@SF\/(.+)$/) {
                my $sfpath = $1;
                open SF, "wget -t1 -q -O- 'http://prdownloads.sf.net/$sfpath/$filename' |";


@@ -69,9 +64,26 @@ while (!$ok) {
                        };
                }
                close SF;
                        };
                }
                close SF;

+       } elsif ($mirror =~ /^\@GNU\/(.+)$/) {
+               my $gnupath = $1;
+               push @mirrors, "ftp://ftp.gnu.org/gnu/$gnupath";
+               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";

        } else {
        } else {

-               download($mirror);
+               push @mirrors, $mirror;

        }
        }

+}
+
+push @mirrors, 'http://mirror1.openwrt.org/';
+push @mirrors, 'http://mirror2.openwrt.org/';
+push @mirrors, 'http://downloads.openwrt.org/sources/';
+
+while (!$ok) {
+       my $mirror = shift @mirrors;
+       $mirror or die "No more mirrors to try - giving up.\n";
+       
+       download($mirror);

        -f "$target/$filename" and $ok = 1;
 }
 
        -f "$target/$filename" and $ok = 1;
 }