Skip to content

Commit

Permalink
Issue #425: Defer candidate initialisation until after source evaluat…
Browse files Browse the repository at this point in the history
…ion.
  • Loading branch information
marc0der committed May 19, 2016
1 parent 67f8a94 commit 7fd6801
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions src/main/bash/sdkman-init.sh
Expand Up @@ -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}"
Expand All @@ -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
Expand Down

0 comments on commit 7fd6801

Please sign in to comment.