[tools] mm-macros: update to 0.9.5

[openwrt.git] / scripts / download.pl

diff --git a/scripts/download.pl b/scripts/download.pl
index 50ecfc6..042b1cc 100755 (executable)
--- a/scripts/download.pl
+++ b/scripts/download.pl
@@ -24,7 +24,7 @@ sub localmirrors {
        open LM, "$scriptdir/localmirrors" and do {
            while (<LM>) {
                        chomp $_;
-                       push @mlist, $_;
+                       push @mlist, $_ if $_;
                }
                close LM;
        };
@@ -136,14 +136,12 @@ foreach my $mirror (@ARGV) {
                push @mirrors, "ftp://ftp.digex.net/pub/gnu/$1";
        } elsif ($mirror =~ /^\@KERNEL\/(.+)$/) {
                my @extra = ( $1 );
-               if ($filename =~ /linux-\d+\.\d+\.\d+-rc/) {
+               if ($filename =~ /linux-\d+\.\d+(?:\.\d+)?-rc/) {
                        push @extra, "$extra[0]/testing";
-               } elsif ($filename =~ /linux-(\d+\.\d+\.\d+)/) {
+               } elsif ($filename =~ /linux-(\d+\.\d+(?:\.\d+)?)/) {
                        push @extra, "$extra[0]/longterm/v$1";
                }               
                foreach my $dir (@extra) {
-                       push @mirrors, "ftp://ftp.geo.kernel.org/pub/$dir";
-                       push @mirrors, "http://ftp.geo.kernel.org/pub/$dir";
                        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";