mirror/sdkman-cli
1
0
Fork 0
mirror of https://github.com/sdkman/sdkman-cli.git synced 2026-06-07 23:37:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improve __sdkman_secure_curl_download (#763)

Browse Source 
* Use shell-agnostic code in …_secure_curl_download
* Replicate original order of curl arguments
This commit is contained in:
Ross Goldberg
2020-05-24 16:20:16 -04:00
committed by GitHub
parent fb8ac9a9f8
commit 98da69c2d3
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/bash/sdkman-utils.sh
View File

@@ -31,32 +31,30 @@ function __sdkman_secure_curl() {
}
function __sdkman_secure_curl_download() {
local curl_params="--progress-bar --location"
if [[ "${sdkman_insecure_ssl}" == 'true' ]]; then
curl_params="$curl_params --insecure"
fi
local curl_params
curl_params=('--progress-bar' '--location')
if [[ ! -z "${sdkman_curl_retry}" ]]; then
curl_params="--retry ${sdkman_curl_retry} ${curl_params}"
fi
if [[ ! -z "${sdkman_curl_retry_max_time}" ]]; then
curl_params="--retry-max-time ${sdkman_curl_retry_max_time} ${curl_params}"
if [[ "${sdkman_debug_mode}" == 'true' ]]; then
curl_params+=('--verbose')
fi
if [[ "${sdkman_curl_continue}" == 'true' ]]; then
curl_params="-C - ${curl_params}"
curl_params+=('-C' '-')
fi
if [[ "${sdkman_debug_mode}" == 'true' ]]; then
curl_params="--verbose ${curl_params}"
if [[ -n "${sdkman_curl_retry_max_time}" ]]; then
curl_params+=('--retry-max-time' "${sdkman_curl_retry_max_time}")
fi
if [[ "$zsh_shell" == 'true' ]]; then
curl ${=curl_params} "$@"
else
curl ${curl_params} "$@"
if [[ -n "${sdkman_curl_retry}" ]]; then
curl_params+=('--retry' "${sdkman_curl_retry}")
fi
if [[ "${sdkman_insecure_ssl}" == 'true' ]]; then
curl_params+=('--insecure')
fi
curl "${curl_params[@]}" "${@}"
}
function __sdkman_secure_curl_with_timeouts() {