From 98da69c2d3159db8c50e71e3a4591fa6406e6100 Mon Sep 17 00:00:00 2001
From: Ross Goldberg <rgoldberg@users.noreply.github.com>
Date: Sun, 24 May 2020 16:20:16 -0400
Subject: [PATCH] Improve __sdkman_secure_curl_download (#763)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Use shell-agnostic code in …_secure_curl_download
* Replicate original order of curl arguments
---
 src/main/bash/sdkman-utils.sh | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/main/bash/sdkman-utils.sh b/src/main/bash/sdkman-utils.sh
index 62ad0770..a4c33e43 100644
--- a/src/main/bash/sdkman-utils.sh
+++ b/src/main/bash/sdkman-utils.sh
@@ -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() {