projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
download.pl: fix detecting download errors with curl
[openwrt/openwrt.git]
/
scripts
/
download.pl
diff --git
a/scripts/download.pl
b/scripts/download.pl
index ad8b837288c594eeda0287f571dd3f09c06d85d8..7eb7c7ebce311adb9a78728abb7fc4e7495ab4b9 100755
(executable)
--- a/
scripts/download.pl
+++ b/
scripts/download.pl
@@
-65,12
+65,8
@@
sub hash_cmd() {
my $len = length($file_hash);
my $cmd;
my $len = length($file_hash);
my $cmd;
- $len == 64 and return "openssl dgst -sha256 | sed -e 's,.*= ,,'";
- $len == 32 and do {
- my $cmd = which("md5sum") || which("md5") || die 'no md5 checksum program found, please install md5 or md5sum';
- chomp $cmd;
- return $cmd;
- };
+ $len == 64 and return "mkhash sha256";
+ $len == 32 and return "mkhash md5";
return undef;
}
return undef;
}
@@
-86,7
+82,7
@@
sub download_cmd($) {
}
return $have_curl
}
return $have_curl
- ? (qw(curl --connect-timeout 20 --retry 5 --location --insecure), shellwords($ENV{CURL_OPTIONS} || ''), $url)
+ ? (qw(curl -
f -
-connect-timeout 20 --retry 5 --location --insecure), shellwords($ENV{CURL_OPTIONS} || ''), $url)
: (qw(wget --tries=5 --timeout=20 --no-check-certificate --output-document=-), shellwords($ENV{WGET_OPTIONS} || ''), $url)
;
}
: (qw(wget --tries=5 --timeout=20 --no-check-certificate --output-document=-), shellwords($ENV{WGET_OPTIONS} || ''), $url)
;
}