X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=scripts%2Fdownload.pl;h=859e6c8ba6b988d392ab2d51f1fd0f9692221392;hb=ef099e7a8175b13f21361b58e6b3db12f36022b9;hp=f636cca7eb3fa1d9d4c7128cc6b7f513d46a22b3;hpb=39ed9eab85c390e575242b9d170f290272b6f582;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/scripts/download.pl b/scripts/download.pl
index f636cca7eb..859e6c8ba6 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;
@@ -68,19 +80,10 @@ sub cleanup
 
 foreach my $mirror (@ARGV) {
 	if ($mirror =~ /^\@SF\/(.+)$/) {
-		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";
-			};
-			/<a href="\/.+\?use_mirror=(\w+)"><b>Download/ and do {
-				push @mirrors, "http://$1.dl.sourceforge.net/sourceforge/$sfpath";
-			};
+		# give sourceforge a few more tries, because it redirects to different mirrors
+		for (1 .. 5) {
+			push @mirrors, "http://downloads.sourceforge.net/$1";
 		}
-		push @mirrors, "http://dl.sourceforge.net/sourceforge/$sfpath";
-		close SF;
 	} elsif ($mirror =~ /^\@GNU\/(.+)$/) {
 		my $gnupath = $1;
 		push @mirrors, "ftp://ftp.gnu.org/gnu/$gnupath";
@@ -96,9 +99,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;