From d691ca18ca64d108892893f3222a90d36f7298ca Mon Sep 17 00:00:00 2001 From: Marco Vermeulen Date: Mon, 19 Oct 2015 18:54:42 +0100 Subject: [PATCH] IMPROVEMENT - Add back preparation of candidate list. Remove obsolete empty candidate folders. --- src/main/bash/selfupdate.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/main/bash/selfupdate.sh b/src/main/bash/selfupdate.sh index 6cd1755a..b2e19ab3 100755 --- a/src/main/bash/selfupdate.sh +++ b/src/main/bash/selfupdate.sh @@ -176,6 +176,23 @@ mkdir -p "${SDKMAN_DIR}/src" mkdir -p "${SDKMAN_DIR}/var" mkdir -p "${SDKMAN_DIR}/tmp" +# prepare candidates +SDKMAN_CANDIDATES_CSV=$(curl -s "${SDKMAN_SERVICE}/candidates") +echo "$SDKMAN_CANDIDATES_CSV" > "${SDKMAN_DIR}/var/candidates" + +# remove empty candidate directories +# convert csv to array +OLD_IFS="$IFS" +IFS="," +SDKMAN_CANDIDATES=(${SDKMAN_CANDIDATES_CSV}) +IFS="$OLD_IFS" + +for candidate in "${SDKMAN_CANDIDATES[@]}"; do + if [[ -n "$candidate" ]]; then + sdkman_echo_debug "Attempt removal of ${candidate} dir: ${SDKMAN_DIR}/${candidate}" + rmdir --ignore-fail-on-non-empty "${SDKMAN_DIR}/${candidate}" + fi +done # extract new distribution sdkman_echo_debug "Extract script archive..."