ar71xx: fix sysupgrade on the TL-WR841N/ND v7 boards

[openwrt.git] / scripts / download.pl

diff --git a/scripts/download.pl b/scripts/download.pl
index 50ecfc6..7d2c41e 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 $_;
        open LM, "$scriptdir/localmirrors" and do {
            while (<LM>) {
                        chomp $_;

-                       push @mlist, $_;
+                       push @mlist, $_ if $_;

                }
                close LM;
        };
                }
                close LM;
        };


@@ -136,9 +136,9 @@ foreach my $mirror (@ARGV) {
                push @mirrors, "ftp://ftp.digex.net/pub/gnu/$1";
        } elsif ($mirror =~ /^\@KERNEL\/(.+)$/) {
                my @extra = ( $1 );
                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";
                        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 @extra, "$extra[0]/longterm/v$1";
                }               
                foreach my $dir (@extra) {