X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=scripts%2Fdownload.pl;h=7eb7c7ebce311adb9a78728abb7fc4e7495ab4b9;hb=76f1b9457d88b9ae2f0f578c10c4155c23c03c24;hp=ad8b837288c594eeda0287f571dd3f09c06d85d8;hpb=fc6b6f45831e1a2afc95ac241416acbd103fd442;p=openwrt%2Fopenwrt.git diff --git a/scripts/download.pl b/scripts/download.pl index ad8b837288..7eb7c7ebce 100755 --- a/scripts/download.pl +++ b/scripts/download.pl @@ -65,12 +65,8 @@ sub hash_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; } @@ -86,7 +82,7 @@ sub download_cmd($) { } 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) ; }