X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/26448e3894f52004cd9667bfdbb2a34a14260696..f7ffac542813fb983d61cfd9c97a077f92df747e:/scripts/download.pl?ds=sidebyside

diff --git a/scripts/download.pl b/scripts/download.pl
index 8f5d1d6b4..859e6c8ba 100755
--- a/scripts/download.pl
+++ b/scripts/download.pl
@@ -37,7 +37,8 @@ sub download
 	my $mirror = shift;
 	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";
@@ -79,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";
@@ -107,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;