mirror/sdkman-cli
1
0
Fork 0
mirror of https://github.com/sdkman/sdkman-cli.git synced 2026-01-30 17:23:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert to SDKMAN_SERVICE environment variable for selupdate backward compatibility."

Browse Source 
This reverts commit b3417ef4ac.
This commit is contained in:
Marco Vermeulen
2016-09-04 02:10:50 +01:00
parent b3417ef4ac
commit 5c4cf12e8b
9 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@@ -62,9 +62,9 @@ task prepareScripts(type: Copy) {
include '**/*'
filter(ReplaceTokens, tokens:
[
SDKMAN_VERSION : sdkmanCliBuildVersion,
SDKMAN_SERVICE : config.sdkmanLegacyApi,
SDKMAN_CURRENT_SERVICE: config.sdkmanCurrentApi
SDKMAN_VERSION : sdkmanCliBuildVersion,
SDKMAN_LEGACY_API: config.sdkmanLegacyApi,
SDKMAN_CURRENT_API : config.sdkmanCurrentApi
]
)
}

4
src/main/bash/sdkman-availability.sh
View File

@@ -26,7 +26,7 @@ function __sdkman_determine_broadcast_id {
if [[ "$SDKMAN_OFFLINE_MODE" == "true" || "$COMMAND" == "offline" && "$QUALIFIER" == "enable" ]]; then
echo ""
else
echo $(__sdkman_secure_curl_with_timeouts "${SDKMAN_CURRENT_SERVICE}/broadcast/latest/id")
echo $(__sdkman_secure_curl_with_timeouts "${SDKMAN_CURRENT_API}/broadcast/latest/id")
fi
}
@@ -87,7 +87,7 @@ function __sdkman_update_broadcast {
echo "$broadcast_live_id" > "$broadcast_id_file"
BROADCAST_LIVE_TEXT=$(__sdkman_secure_curl "${SDKMAN_CURRENT_SERVICE}/broadcast/latest")
BROADCAST_LIVE_TEXT=$(__sdkman_secure_curl "${SDKMAN_CURRENT_API}/broadcast/latest")
echo "$BROADCAST_LIVE_TEXT" > "$broadcast_text_file"
if [[ "$COMMAND" != "broadcast" ]]; then
echo "$BROADCAST_LIVE_TEXT"

4
src/main/bash/sdkman-env-helpers.sh
View File

@@ -59,10 +59,10 @@ function __sdkman_determine_version {
elif [[ "$SDKMAN_AVAILABLE" == "true" && -z "$version" ]]; then
VERSION_VALID='valid'
VERSION=$(__sdkman_secure_curl "${SDKMAN_SERVICE}/candidates/${candidate}/default")
VERSION=$(__sdkman_secure_curl "${SDKMAN_LEGACY_API}/candidates/${candidate}/default")
else
VERSION_VALID=$(__sdkman_secure_curl "${SDKMAN_SERVICE}/candidates/${candidate}/${version}")
VERSION_VALID=$(__sdkman_secure_curl "${SDKMAN_LEGACY_API}/candidates/${candidate}/${version}")
if [[ "$VERSION_VALID" == 'valid' || "$VERSION_VALID" == 'invalid' && -n "$folder" ]]; then
VERSION="$version"

12
src/main/bash/sdkman-init.sh
View File

@@ -22,12 +22,12 @@ if [ -z "$SDKMAN_VERSION" ]; then
export SDKMAN_VERSION="@SDKMAN_VERSION@"
fi
if [ -z "$SDKMAN_SERVICE" ]; then
export SDKMAN_SERVICE="@SDKMAN_SERVICE@"
if [ -z "$SDKMAN_LEGACY_API" ]; then
export SDKMAN_LEGACY_API="@SDKMAN_LEGACY_API@"
fi
if [ -z "$SDKMAN_CURRENT_SERVICE" ]; then
export SDKMAN_CURRENT_SERVICE="@SDKMAN_CURRENT_SERVICE@"
if [ -z "$SDKMAN_CURRENT_API" ]; then
export SDKMAN_CURRENT_API="@SDKMAN_CURRENT_API@"
fi
if [ -z "$SDKMAN_DIR" ]; then
@@ -116,7 +116,7 @@ fi
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")
SDKMAN_CANDIDATES_CSV=$(__sdkman_secure_curl "${SDKMAN_LEGACY_API}/candidates")
echo "$SDKMAN_CANDIDATES_CSV" > "${SDKMAN_DIR}/var/candidates"
fi
@@ -136,7 +136,7 @@ if [[ -f "$SDKMAN_VERSION_TOKEN" && -z "$(find "$SDKMAN_VERSION_TOKEN" -mmin +$(
SDKMAN_REMOTE_VERSION=$(cat "$SDKMAN_VERSION_TOKEN")
else
SDKMAN_REMOTE_VERSION=$(__sdkman_secure_curl_with_timeouts "${SDKMAN_SERVICE}/app/cliversion")
SDKMAN_REMOTE_VERSION=$(__sdkman_secure_curl_with_timeouts "${SDKMAN_LEGACY_API}/app/cliversion")
DETECT_HTML="$(echo "$SDKMAN_REMOTE_VERSION" | tr '[:upper:]' '[:lower:]' | grep 'html')"
if [[ -z "$SDKMAN_REMOTE_VERSION" || -n "$DETECT_HTML" ]]; then
SDKMAN_REMOTE_VERSION="$SDKMAN_VERSION"

2
src/main/bash/sdkman-install.sh
View File

@@ -102,7 +102,7 @@ function __sdkman_download {
echo ""
echo "In progress..."
echo ""
local download_url="${SDKMAN_CURRENT_SERVICE}/broker/download/${candidate}/${version}?platform=${SDKMAN_PLATFORM}"
local download_url="${SDKMAN_CURRENT_API}/broker/download/${candidate}/${version}?platform=${SDKMAN_PLATFORM}"
local zip_archive="${SDKMAN_DIR}/archives/${candidate}-${version}.zip"
__sdkman_secure_curl_download "$download_url" > "$zip_archive"
else

4
src/main/bash/sdkman-list.sh
View File

@@ -30,7 +30,7 @@ function __sdkman_list_candidates {
if [[ "$SDKMAN_AVAILABLE" == "false" ]]; then
echo "This command is not available while offline."
else
__sdkman_page echo "$(__sdkman_secure_curl "${SDKMAN_SERVICE}/candidates/list")"
__sdkman_page echo "$(__sdkman_secure_curl "${SDKMAN_LEGACY_API}/candidates/list")"
fi
}
@@ -44,7 +44,7 @@ function __sdkman_list_versions {
if [[ "$SDKMAN_AVAILABLE" == "false" ]]; then
__sdkman_offline_list "$candidate" "$versions_csv"
else
echo "$(__sdkman_secure_curl "${SDKMAN_SERVICE}/candidates/${candidate}/list?current=${CURRENT}&installed=${versions_csv}")"
echo "$(__sdkman_secure_curl "${SDKMAN_LEGACY_API}/candidates/${candidate}/list?current=${CURRENT}&installed=${versions_csv}")"
fi
}

2
src/main/bash/sdkman-outdated.sh
View File

@@ -71,7 +71,7 @@ function __sdkman_determine_outdated_version {
fi
# Resolve remote default version
remote_default_version="$(__sdkman_secure_curl "${SDKMAN_SERVICE}/candidates/${candidate}/default")"
remote_default_version="$(__sdkman_secure_curl "${SDKMAN_LEGACY_API}/candidates/${candidate}/default")"
if [ -z "$remote_default_version" ]; then
return 2
fi

2
src/main/bash/sdkman-selfupdate.sh
View File

@@ -27,7 +27,7 @@ function __sdk_selfupdate {
echo "No update available at this time."
else
__sdkman_secure_curl "${SDKMAN_SERVICE}/selfupdate" | bash
__sdkman_secure_curl "${SDKMAN_LEGACY_API}/selfupdate" | bash
fi
unset SDKMAN_FORCE_SELFUPDATE
}

4
src/test/groovy/sdkman/env/SdkmanBashEnvBuilder.groovy vendored
View File

@@ -120,8 +120,8 @@ class SdkmanBashEnvBuilder {
SDKMAN_DIR: sdkmanDir.absolutePath,
SDKMAN_CANDIDATES_DIR: sdkmanCandidatesDir.absolutePath,
SDKMAN_OFFLINE_MODE: "$offlineMode",
SDKMAN_SERVICE: legacyService,
SDKMAN_CURRENT_SERVICE: currentService,
SDKMAN_LEGACY_API: legacyService,
SDKMAN_CURRENT_API: currentService,
SDKMAN_VERSION: sdkmanVersion,
JAVA_HOME: jdkHome
]