summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-04-30 19:47:17 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-04-30 19:47:17 +0000
commit1ed672d40b5a44d84f3e50af0605f48558f33afa (patch)
treeda7601f7b67ae447aba1ee883aba54233690edac
parent7c65c2fc6cc8f6319cac84405841d292d63e7968 (diff)
fix mirror order in download script
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@772 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xopenwrt/scripts/download.pl22
1 files changed, 13 insertions, 9 deletions
diff --git a/openwrt/scripts/download.pl b/openwrt/scripts/download.pl
index 607a9bde53..8042e2d07c 100755
--- 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 @mirrors = @ARGV;
+my @mirrors;
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
{
@@ -56,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' |";
@@ -70,8 +65,17 @@ while (!$ok) {
}
close SF;
} else {
- download($mirror);
+ push @mirrors, $mirror;
}
+}
+
+push @mirrors, 'http://openwrt.inf.fh-brs.de/mirror';
+
+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;
}