some minor bugfixes in wificonf

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

diff --git a/openwrt/scripts/download.pl b/openwrt/scripts/download.pl
index cbe1934..df55b8f 100755 (executable)
--- a/openwrt/scripts/download.pl
+++ b/openwrt/scripts/download.pl
@@ -5,17 +5,17 @@ use warnings;
 my $target = shift @ARGV;
 my $filename = shift @ARGV;
 my $md5sum = shift @ARGV;
-my @mirrors = @ARGV;
+my @mirrors;
 
 my $ok;
 
-@mirrors > 0 or die "Syntax: $0 <target dir> <filename> <md5sum> <mirror> [<mirror> ...]\n";
+@ARGV > 0 or die "Syntax: $0 <target dir> <filename> <md5sum> <mirror> [<mirror> ...]\n";
 
 sub download
 {
        my $mirror = shift;
        
-       open WGET, "wget -t1 --connect-timeout=20 --read-timeout=15 -O- \"$mirror/$filename\" |" or die "Cannot launch wget.\n";
+       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 OUTPUT, "> $target/$filename.dl" or die "Cannot create file $target/$filename.dl: $!\n";
        my $buffer;
@@ -54,10 +54,7 @@ sub cleanup
        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' |";
@@ -67,9 +64,26 @@ while (!$ok) {
                        };
                }
                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 {
-               download($mirror);
+               push @mirrors, $mirror;
        }
+}
+
+push @mirrors, 'http://mirror1.openwrt.org/';
+push @mirrors, 'http://mirror2.openwrt.org/';
+push @mirrors, 'http://openwrt.org/download/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;
 }