X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fdownload.pl;h=8eb66f035361aeeaf32179a7a5d70f31fa3af86e;hb=a1e679979795d56cae454b51145ed09e0b8a0a89;hp=f636cca7eb3fa1d9d4c7128cc6b7f513d46a22b3;hpb=60c1f0f64d23003a19a07d6b9638542130f6641d;p=lede-git%2F.git

diff --git a/scripts/download.pl b/scripts/download.pl
index f636cca7eb..8eb66f0353 100755
--- a/scripts/download.pl
+++ b/scripts/download.pl
@@ -18,16 +18,28 @@ my $ok;
 
 @ARGV > 0 or die "Syntax: $0 <target dir> <filename> <md5sum> <mirror> [<mirror> ...]\n";
 
-my $md5cmd = `which md5sum`;
-$md5cmd or $md5cmd = `which md5`;
+sub which($) {
+	my $prog = shift;
+	my $res = `which $prog`;
+	$res or return undef;
+	$res =~ /^no / and return undef;
+	$res =~ /not found/ and return undef;
+	return $res;
+}
+
+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";
+	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;
@@ -96,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;