Patch for extif watchdog support. Thanks b.sander. Closes #2363 #2814 and #3141

[openwrt.git] / scripts / download.pl

diff --git a/scripts/download.pl b/scripts/download.pl
index 66eaca8..e885ff2 100755 (executable)
--- a/scripts/download.pl
+++ b/scripts/download.pl
@@ -10,16 +10,15 @@ use strict;
 use warnings;
 use File::Basename;
 
+@ARGV > 2 or die "Syntax: $0 <target dir> <filename> <md5sum> [<mirror> ...]\n";
+
 my $target = shift @ARGV;
 my $filename = shift @ARGV;
 my $md5sum = shift @ARGV;
 my $scriptdir = dirname($0);
 my @mirrors;
-
 my $ok;
 
-@ARGV > 0 or die "Syntax: $0 <target dir> <filename> <md5sum> <mirror> [<mirror> ...]\n";
-
 sub localmirrors {
     my @mlist;
     open LM, "$scriptdir/localmirrors" and do {
@@ -64,7 +63,7 @@ sub download
        $options or $options = "";
        
        $mirror =~ s/\/$//;
-       open WGET, "wget -t1 --timeout=20 $options -O- \"$mirror/$filename\" |" or die "Cannot launch wget.\n";
+       open WGET, "wget -t5 --timeout=20 $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;
@@ -87,7 +86,7 @@ sub download
        $sum = $1;
        
        if (($md5sum =~ /\w{32}/) and ($sum ne $md5sum)) {
-               print STDERR "MD5 sum of the downloaded file does not match - deleting download.\n";
+               print STDERR "MD5 sum of the downloaded file does not match (file: $sum, requested: $md5sum) - deleting download.\n";
                cleanup();
                return;
        }