diff --git a/src/main/bash/sdkman-init.sh b/src/main/bash/sdkman-init.sh index 7e9b36458..c18b19912 100644 --- a/src/main/bash/sdkman-init.sh +++ b/src/main/bash/sdkman-init.sh @@ -90,20 +90,6 @@ if [ -z "$JAVA_HOME" ] ; then fi fi -# fabricate list of candidates -if [[ -f "${SDKMAN_DIR}/var/candidates" ]]; then - SDKMAN_CANDIDATES_CSV=$(cat "${SDKMAN_DIR}/var/candidates") -else - SDKMAN_CANDIDATES_CSV=$(__sdkman_secure_curl "${SDKMAN_SERVICE}/candidates") - echo "$SDKMAN_CANDIDATES_CSV" > "${SDKMAN_DIR}/var/candidates" -fi - -# Set the candidate array -OLD_IFS="$IFS" -IFS="," -SDKMAN_CANDIDATES=(${SDKMAN_CANDIDATES_CSV}) -IFS="$OLD_IFS" - # Source sdkman module scripts. for f in $(find "${SDKMAN_DIR}/src" -type f -name 'sdkman-*' -exec basename {} \;); do source "${SDKMAN_DIR}/src/${f}" @@ -127,6 +113,20 @@ if [[ ! -f "${SDKMAN_DIR}/var/delay_upgrade" ]]; then touch "${SDKMAN_DIR}/var/delay_upgrade" fi +# fabricate list of candidates +if [[ -f "${SDKMAN_DIR}/var/candidates" ]]; then + SDKMAN_CANDIDATES_CSV=$(cat "${SDKMAN_DIR}/var/candidates") +else + SDKMAN_CANDIDATES_CSV=$(__sdkman_secure_curl "${SDKMAN_SERVICE}/candidates") + echo "$SDKMAN_CANDIDATES_CSV" > "${SDKMAN_DIR}/var/candidates" +fi + +# Set the candidate array +OLD_IFS="$IFS" +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