From e00e33b532f29bf2b5a695d32f2dd05e7fe89ce9 Mon Sep 17 00:00:00 2001 From: Jason Palmer Date: Fri, 9 Dec 2016 03:10:35 -0500 Subject: [PATCH] Fix bug when trying to use curl to get candidate list. (#498) Set curl timeout defaults _before_ using curl to get candidates. --- src/main/bash/sdkman-init.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/bash/sdkman-init.sh b/src/main/bash/sdkman-init.sh index bab3443b..2b4ce62d 100644 --- a/src/main/bash/sdkman-init.sh +++ b/src/main/bash/sdkman-init.sh @@ -83,6 +83,10 @@ if [[ ! -f "${SDKMAN_DIR}/var/delay_upgrade" ]]; then touch "${SDKMAN_DIR}/var/delay_upgrade" fi +# set curl connect-timeout and max-time +if [[ -z "$sdkman_curl_connect_timeout" ]]; then sdkman_curl_connect_timeout=7; fi +if [[ -z "$sdkman_curl_max_time" ]]; then sdkman_curl_max_time=10; fi + # fabricate list of candidates SDKMAN_CANDIDATES_CACHE="${SDKMAN_DIR}/var/candidates" if [[ -f "$SDKMAN_CANDIDATES_CACHE" && -n "$(cat "$SDKMAN_CANDIDATES_CACHE")" && -z "$(find "$SDKMAN_CANDIDATES_CACHE" -mmin +$((60*24)))" ]]; then @@ -107,10 +111,6 @@ IFS="," SDKMAN_CANDIDATES=(${SDKMAN_CANDIDATES_CSV}) IFS="$OLD_IFS" -# set curl connect-timeout and max-time -if [[ -z "$sdkman_curl_connect_timeout" ]]; then sdkman_curl_connect_timeout=7; fi -if [[ -z "$sdkman_curl_max_time" ]]; then sdkman_curl_max_time=10; fi - # determine if up to date SDKMAN_VERSION_FILE="${SDKMAN_DIR}/var/version" if [[ "$sdkman_beta_channel" != "true" && -f "$SDKMAN_VERSION_FILE" && -z "$(find "$SDKMAN_VERSION_FILE" -mmin +$((60*24)))" ]]; then