mpc83xx: clean up the mess caused by the reverted sorting patch

[openwrt.git] / scripts / download.pl

diff --git a/scripts/download.pl b/scripts/download.pl
index 8934c55..fe27df5 100755 (executable)
--- a/scripts/download.pl
+++ b/scripts/download.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/env perl

 # 
 # Copyright (C) 2006 OpenWrt.org
 #
 # 
 # Copyright (C) 2006 OpenWrt.org
 #


@@ -32,7 +32,8 @@ sub localmirrors {
                while (<CONFIG>) {
                        /^CONFIG_LOCALMIRROR="(.+)"/ and do {
                                chomp;
                while (<CONFIG>) {
                        /^CONFIG_LOCALMIRROR="(.+)"/ and do {
                                chomp;

-                               push @mlist, $1;
+                               my @local_mirrors = split(/;/, $1);
+                               push @mlist, @local_mirrors;

                        };
                }
                close CONFIG;
                        };
                }
                close CONFIG;


@@ -65,9 +66,15 @@ sub download
        if( $mirror =~ /^file:\/\// ) {
                my $cache = $mirror;
                $cache =~ s/file:\/\///g;
        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";
                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";


@@ -128,6 +135,8 @@ 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.leo.org/pub/comp/os/unix/gnu/$1";
                push @mirrors, "ftp://ftp.digex.net/pub/gnu/$1";
        } elsif ($mirror =~ /^\@KERNEL\/(.+)$/) {

+               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, "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";