strip trailing / from download urls

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

diff --git a/scripts/download.pl b/scripts/download.pl
index c29b5fe78e331dbcae809a281746467db0c47a3a..8eb66f035361aeeaf32179a7a5d70f31fa3af86e 100755 (executable)
--- a/scripts/download.pl
+++ b/scripts/download.pl
@@ -35,8 +35,11 @@ chomp $md5cmd;
 sub download
 {
        my $mirror = shift;
-
-       open WGET, "wget -t1 --timeout=20 -O- \"$mirror/$filename\" |" or die "Cannot launch wget.\n";
+       my $options = $ENV{WGET_OPTIONS};
+       $options or $options = "";
+       
+       $mirror =~ s/\/$//;
+       open WGET, "wget -t1 --timeout=20 $options -O- \"$mirror/$filename\" |" or die "Cannot launch wget.\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;
@@ -105,9 +108,9 @@ foreach my $mirror (@ARGV) {
        }
 }
 
-#push @mirrors, 'http://mirror1.openwrt.org/';
+#push @mirrors, 'http://mirror1.openwrt.org';
 push @mirrors, 'http://mirror2.openwrt.org/sources';
-push @mirrors, 'http://downloads.openwrt.org/sources/';
+push @mirrors, 'http://downloads.openwrt.org/sources';
 
 while (!$ok) {
        my $mirror = shift @mirrors;