projects
/
openwrt
/
staging
/
jogo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
607b012
)
real fix for download.pl
author
Felix Fietkau
<nbd@openwrt.org>
Tue, 10 Oct 2006 16:17:16 +0000
(16:17 +0000)
committer
Felix Fietkau
<nbd@openwrt.org>
Tue, 10 Oct 2006 16:17:16 +0000
(16:17 +0000)
SVN-Revision: 5018
openwrt/scripts/download.pl
patch
|
blob
|
history
diff --git
a/openwrt/scripts/download.pl
b/openwrt/scripts/download.pl
index e7c7ee32e6a6beadf0227182d1afb862cbe84ab0..f636cca7eb3fa1d9d4c7128cc6b7f513d46a22b3 100755
(executable)
--- a/
openwrt/scripts/download.pl
+++ b/
openwrt/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`;
@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
{
sub download
{
@@
-43,7
+44,6
@@
sub download
cleanup();
return;
}
cleanup();
return;
}
- $? = 0;
my $sum = `cat "$target/$filename.md5sum"`;
$sum =~ /^(\w+)\s*/ or die "Could not generate md5sum\n";
my $sum = `cat "$target/$filename.md5sum"`;
$sum =~ /^(\w+)\s*/ or die "Could not generate md5sum\n";