X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=scripts%2Fdownload.pl;h=042b1cce7d79371fc6f8f30f7fe908e0464e626c;hb=bd1c29df74d3174c654491641179f2199e6b2ce8;hp=8934c55500d8aa48bbd3bf2ace91c0e29fe53c3c;hpb=2552e9362b8b6ce157d3903df6477e7b35bab1ef;p=oweals%2Fopenwrt.git

diff --git a/scripts/download.pl b/scripts/download.pl
index 8934c55500..042b1cce7d 100755
--- a/scripts/download.pl
+++ b/scripts/download.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl
 # 
 # Copyright (C) 2006 OpenWrt.org
 #
@@ -24,7 +24,7 @@ sub localmirrors {
 	open LM, "$scriptdir/localmirrors" and do {
 	    while (<LM>) {
 			chomp $_;
-			push @mlist, $_;
+			push @mlist, $_ if $_;
 		}
 		close LM;
 	};
@@ -32,7 +32,8 @@ sub localmirrors {
 		while (<CONFIG>) {
 			/^CONFIG_LOCALMIRROR="(.+)"/ and do {
 				chomp;
-				push @mlist, $1;
+				my @local_mirrors = split(/;/, $1);
+				push @mlist, @local_mirrors;
 			};
 		}
 		close CONFIG;
@@ -65,12 +66,18 @@ sub download
 	if( $mirror =~ /^file:\/\// ) {
 		my $cache = $mirror;
 		$cache =~ s/file:\/\///g;
-		print "Checking local cache: $cache\n";
-		system("mkdir -p $target/");
-		system("cp -f $cache/$filename $target/$filename.dl") == 0 or return;
+		if(system("test -d $cache")) {
+			print STDERR "Wrong local cache directory -$cache-.\n";
+			cleanup();
+			return;
+		}
+		if(! -d $target) {
+			system("mkdir -p $target/");
+		}
+		system("cp -vf $cache/$filename $target/$filename.dl") == 0 or return;
 		system("$md5cmd $target/$filename.dl > \"$target/$filename.md5sum\" ") == 0 or return;
 	} else {
-		open WGET, "wget -t5 --timeout=20 $options -O- \"$mirror/$filename\" |" or die "Cannot launch wget.\n";
+		open WGET, "wget -t5 --timeout=20 --no-check-certificate $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;
@@ -128,12 +135,20 @@ foreach my $mirror (@ARGV) {
 		push @mirrors, "ftp://ftp.leo.org/pub/comp/os/unix/gnu/$1";
 		push @mirrors, "ftp://ftp.digex.net/pub/gnu/$1";
 	} elsif ($mirror =~ /^\@KERNEL\/(.+)$/) {
-		push @mirrors, "ftp://ftp.all.kernel.org/pub/$1";
-		push @mirrors, "http://ftp.all.kernel.org/pub/$1";
-		push @mirrors, "ftp://ftp.de.kernel.org/pub/$1";
-		push @mirrors, "http://ftp.de.kernel.org/pub/$1";
-		push @mirrors, "ftp://ftp.fr.kernel.org/pub/$1";
-		push @mirrors, "http://ftp.fr.kernel.org/pub/$1";
+		my @extra = ( $1 );
+		if ($filename =~ /linux-\d+\.\d+(?:\.\d+)?-rc/) {
+			push @extra, "$extra[0]/testing";
+		} elsif ($filename =~ /linux-(\d+\.\d+(?:\.\d+)?)/) {
+			push @extra, "$extra[0]/longterm/v$1";
+		}		
+		foreach my $dir (@extra) {
+			push @mirrors, "ftp://ftp.all.kernel.org/pub/$dir";
+			push @mirrors, "http://ftp.all.kernel.org/pub/$dir";
+			push @mirrors, "ftp://ftp.de.kernel.org/pub/$dir";
+			push @mirrors, "http://ftp.de.kernel.org/pub/$dir";
+			push @mirrors, "ftp://ftp.fr.kernel.org/pub/$dir";
+			push @mirrors, "http://ftp.fr.kernel.org/pub/$dir";
+		}
     } elsif ($mirror =~ /^\@GNOME\/(.+)$/) {
 		push @mirrors, "http://ftp.gnome.org/pub/GNOME/sources/$1";
 		push @mirrors, "http://ftp.unina.it/pub/linux/GNOME/sources/$1";