X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=scripts%2Fdownload.pl;h=8f5d1d6b464c2a98a896fe329139b9f901fbdc7c;hb=0979ae370d0611e68a29112fc38a58f5736e2d3a;hp=84c97cf9a92aa716af474f240ad36c1edf9fcf19;hpb=350b643ec5b5096d260ed5c20459127203b92ae4;p=openwrt.git

diff --git a/scripts/download.pl b/scripts/download.pl
index 84c97cf9a9..8f5d1d6b46 100755
--- a/scripts/download.pl
+++ b/scripts/download.pl
@@ -1,4 +1,11 @@
 #!/usr/bin/perl
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
 use strict;
 use warnings;
 
@@ -11,12 +18,28 @@ my $ok;
 
 @ARGV > 0 or die "Syntax: $0 <target dir> <filename> <md5sum> <mirror> [<mirror> ...]\n";
 
+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";
-	open MD5SUM, "| md5sum > \"$target/$filename.md5sum\"" or die "Cannot launch md5sum.\n";
+	my $options = $ENV{WGET_OPTIONS};
+	$options or $options = "";
+
+	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;
 	while (read WGET, $buffer, 1048576) {
@@ -34,7 +57,7 @@ sub download
 	}
 	
 	my $sum = `cat "$target/$filename.md5sum"`;
-	$sum =~ /^(\w+)\s+/ or die "Could not generate md5sum\n";
+	$sum =~ /^(\w+)\s*/ or die "Could not generate md5sum\n";
 	$sum = $1;
 	
 	if (($md5sum =~ /\w{32}/) and ($sum ne $md5sum)) {
@@ -59,6 +82,7 @@ foreach my $mirror (@ARGV) {
 		my $sfpath = $1;
 		open SF, "wget -t1 -q -O- 'http://prdownloads.sourceforge.net/$sfpath/$filename' |";
 		while (<SF>) {
+			/RADIO NAME=use_default VALUE=(\w+) OnClick="form\.submit\(\)">/ or
 			/type="radio" name="use_default" value="(\w+)" onclick="form\.submit\(\)"\/>/ and do {
 				push @mirrors, "http://$1.dl.sourceforge.net/sourceforge/$sfpath";
 			};
@@ -84,7 +108,7 @@ foreach my $mirror (@ARGV) {
 }
 
 #push @mirrors, 'http://mirror1.openwrt.org/';
-#push @mirrors, 'http://mirror2.openwrt.org/';
+push @mirrors, 'http://mirror2.openwrt.org/sources';
 push @mirrors, 'http://downloads.openwrt.org/sources/';
 
 while (!$ok) {