remove sed test garbage left behind on some hosts with an old/unsupported sed

[openwrt/staging/dedeckeh.git] / openwrt / scripts / download.pl

diff --git a/openwrt/scripts/download.pl b/openwrt/scripts/download.pl
index feb38a1beed7dbcd81dc002e8d4aa9f80af3f1df..f636cca7eb3fa1d9d4c7128cc6b7f513d46a22b3 100755 (executable)
--- a/openwrt/scripts/download.pl
+++ b/openwrt/scripts/download.pl
@@ -18,12 +18,17 @@ my $ok;
 
 @ARGV > 0 or die "Syntax: $0 <target dir> <filename> <md5sum> <mirror> [<mirror> ...]\n";
 
+my $md5cmd = `which md5sum`;
+$md5cmd or $md5cmd = `which md5`;
+$md5cmd or die 'no md5 checksum program found, please install md5 or md5sum';
+chomp $md5cmd;
+
 sub download
 {
        my $mirror = shift;
-       
+
        open WGET, "wget -t1 --timeout=20 -O- \"$mirror/$filename\" |" or die "Cannot launch wget.\n";
-       open MD5SUM, "| md5sum > \"$target/$filename.md5sum\"" or die "Cannot launch md5sum.\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;
        while (read WGET, $buffer, 1048576) {
@@ -41,7 +46,7 @@ sub download
        }
        
        my $sum = `cat "$target/$filename.md5sum"`;
-       $sum =~ /^(\w+)\s+/ or die "Could not generate md5sum\n";
+       $sum =~ /^(\w+)\s*/ or die "Could not generate md5sum\n";
        $sum = $1;
        
        if (($md5sum =~ /\w{32}/) and ($sum ne $md5sum)) {
@@ -91,7 +96,7 @@ foreach my $mirror (@ARGV) {
        }
 }
 
-push @mirrors, 'http://mirror1.openwrt.org/';
+#push @mirrors, 'http://mirror1.openwrt.org/';
 push @mirrors, 'http://mirror2.openwrt.org/sources';
 push @mirrors, 'http://downloads.openwrt.org/sources/';