X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=scripts%2Fdownload.pl;h=633a4f6f7dbbb83f4fd6c970c73f4f17f95e6e84;hp=38adb012cc414dbda5ddc8f772ec11c0bafe8350;hb=4b6bba6720bae736607b9d39982c0888c7e83d14;hpb=761ea64e9b47d720dba8b91815faa6d6050b6fd5

diff --git a/scripts/download.pl b/scripts/download.pl
index 38adb012cc..633a4f6f7d 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
 #
@@ -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,15 +135,29 @@ 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.us.kernel.org/pub/$1";
-		push @mirrors, "http://ftp.us.kernel.org/pub/$1";
-		push @mirrors, "ftp://ftp.kernel.org/pub/$1";
-		push @mirrors, "http://ftp.kernel.org/pub/$1";
+		push @mirrors, "ftp://ftp.geo.kernel.org/pub/$1";
+		push @mirrors, "http://ftp.geo.kernel.org/pub/$1";
+		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";
-	} else {
+    } elsif ($mirror =~ /^\@GNOME\/(.+)$/) {
+		push @mirrors, "http://ftp.gnome.org/pub/GNOME/sources/$1";
+		push @mirrors, "http://ftp.unina.it/pub/linux/GNOME/sources/$1";
+		push @mirrors, "http://fr2.rpmfind.net/linux/gnome.org/sources/$1";
+		push @mirrors, "ftp://ftp.dit.upm.es/pub/GNOME/sources/$1";
+		push @mirrors, "ftp://ftp.no.gnome.org/pub/GNOME/sources/$1";
+		push @mirrors, "http://ftp.acc.umu.se/pub/GNOME/sources/$1";
+		push @mirrors, "http://ftp.belnet.be/mirror/ftp.gnome.org/sources/$1";
+		push @mirrors, "http://linorg.usp.br/gnome/sources/$1";
+		push @mirrors, "http://mirror.aarnet.edu.au/pub/GNOME/sources/$1";
+		push @mirrors, "http://mirrors.ibiblio.org/pub/mirrors/gnome/sources/$1";
+		push @mirrors, "ftp://ftp.cse.buffalo.edu/pub/Gnome/sources/$1";
+		push @mirrors, "ftp://ftp.nara.wide.ad.jp/pub/X11/GNOME/sources/$1";
+    }
+    else {
 		push @mirrors, $mirror;
 	}
 }