[imagebuilder] fix initscripts activation (closes: #4037, #4745)

[openwrt.git] / scripts / download.pl

diff --git a/scripts/download.pl b/scripts/download.pl
index 38adb01..5606946 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
 #
@@ -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,9 +66,15 @@ 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";
@@ -128,15 +135,27 @@ 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.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;
        }
 }