Skip to content

Commit 98da69c

Browse files
authored
Improve __sdkman_secure_curl_download (#763)
* Use shell-agnostic code in …_secure_curl_download * Replicate original order of curl arguments
1 parent fb8ac9a commit 98da69c

File tree

1 file changed

+14
-16
lines changed

1 file changed

+14
-16
lines changed

src/main/bash/sdkman-utils.sh

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,32 +31,30 @@ function __sdkman_secure_curl() {
3131
}
3232

3333
function __sdkman_secure_curl_download() {
34-
local curl_params="--progress-bar --location"
35-
if [[ "${sdkman_insecure_ssl}" == 'true' ]]; then
36-
curl_params="$curl_params --insecure"
37-
fi
34+
local curl_params
35+
curl_params=('--progress-bar' '--location')
3836

39-
if [[ ! -z "${sdkman_curl_retry}" ]]; then
40-
curl_params="--retry ${sdkman_curl_retry} ${curl_params}"
37+
if [[ "${sdkman_debug_mode}" == 'true' ]]; then
38+
curl_params+=('--verbose')
4139
fi
4240

43-
if [[ ! -z "${sdkman_curl_retry_max_time}" ]]; then
44-
curl_params="--retry-max-time ${sdkman_curl_retry_max_time} ${curl_params}"
41+
if [[ "${sdkman_curl_continue}" == 'true' ]]; then
42+
curl_params+=('-C' '-')
4543
fi
4644

47-
if [[ "${sdkman_curl_continue}" == 'true' ]]; then
48-
curl_params="-C - ${curl_params}"
45+
if [[ -n "${sdkman_curl_retry_max_time}" ]]; then
46+
curl_params+=('--retry-max-time' "${sdkman_curl_retry_max_time}")
4947
fi
5048

51-
if [[ "${sdkman_debug_mode}" == 'true' ]]; then
52-
curl_params="--verbose ${curl_params}"
49+
if [[ -n "${sdkman_curl_retry}" ]]; then
50+
curl_params+=('--retry' "${sdkman_curl_retry}")
5351
fi
5452

55-
if [[ "$zsh_shell" == 'true' ]]; then
56-
curl ${=curl_params} "$@"
57-
else
58-
curl ${curl_params} "$@"
53+
if [[ "${sdkman_insecure_ssl}" == 'true' ]]; then
54+
curl_params+=('--insecure')
5955
fi
56+
57+
curl "${curl_params[@]}" "${@}"
6058
}
6159

6260
function __sdkman_secure_curl_with_timeouts() {

0 commit comments

Comments
 (0)