fix gene2fs build on freebsd

[openwrt-10.03/.git] / scripts / download.pl

diff --git a/scripts/download.pl b/scripts/download.pl
index 009ed3b689f457568260fa367d5b3992bc6ebae9..f636cca7eb3fa1d9d4c7128cc6b7f513d46a22b3 100755 (executable)
--- a/scripts/download.pl
+++ b/scripts/download.pl
@@ -19,8 +19,9 @@ my $ok;
 @ARGV > 0 or die "Syntax: $0 <target dir> <filename> <md5sum> <mirror> [<mirror> ...]\n";
 
 my $md5cmd = `which md5sum`;
-$md5cmd =~ /not found/ and $md5cmd = `which md5`;
-$md5cmd =~ /not found/ and die 'no md5 checksum program found, please install md5 or md5sum';
+$md5cmd or $md5cmd = `which md5`;
+$md5cmd or die 'no md5 checksum program found, please install md5 or md5sum';
+chomp $md5cmd;
 
 sub download
 {
@@ -45,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)) {