Skip to content

Commit c7374b7

Browse files
committed
Preparation for considering native version in selfupdate.
1 parent 8a8c69d commit c7374b7

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

src/main/bash/sdkman-selfupdate.sh

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,29 @@
1818

1919
function __sdk_selfupdate() {
2020
local force_selfupdate
21-
local sdkman_version_api
21+
local sdkman_script_version_api
22+
local sdkman_native_version_api
2223

2324
if [[ "$SDKMAN_AVAILABLE" == "false" ]]; then
2425
echo "This command is not available while offline."
2526
return 1
2627
fi
2728

2829
if [[ "$sdkman_beta_channel" == "true" ]]; then
29-
sdkman_version_api="${SDKMAN_CANDIDATES_API}/broker/version/sdkman/script/beta"
30+
sdkman_script_version_api="${SDKMAN_CANDIDATES_API}/broker/version/sdkman/script/beta"
31+
sdkman_native_version_api="${SDKMAN_CANDIDATES_API}/broker/version/sdkman/native/beta"
3032
else
31-
sdkman_version_api="${SDKMAN_CANDIDATES_API}/broker/version/sdkman/script/stable"
33+
sdkman_script_version_api="${SDKMAN_CANDIDATES_API}/broker/version/sdkman/script/stable"
34+
sdkman_native_version_api="${SDKMAN_CANDIDATES_API}/broker/version/sdkman/native/stable"
3235
fi
3336

34-
sdkman_remote_version=$(__sdkman_secure_curl "$sdkman_version_api")
35-
sdkman_local_version=$(cat "$SDKMAN_DIR/var/version")
36-
__sdkman_echo_debug "Local version: $sdkman_local_version; remote version: $sdkman_remote_version"
37+
sdkman_remote_script_version=$(__sdkman_secure_curl "$sdkman_script_version_api")
38+
sdkman_local_script_version=$(cat "$SDKMAN_DIR/var/version")
39+
__sdkman_echo_debug "Script: local version: $sdkman_local_script_version; remote version: $sdkman_remote_script_version"
3740

3841
force_selfupdate="$1"
3942
export sdkman_debug_mode
40-
if [[ "$sdkman_local_version" == "$sdkman_remote_version" && "$force_selfupdate" != "force" ]]; then
43+
if [[ "$sdkman_local_script_version" == "$sdkman_remote_script_version" && "$force_selfupdate" != "force" ]]; then
4144
echo "No update available at this time."
4245
elif [[ "$sdkman_beta_channel" == "true" ]]; then
4346
__sdkman_secure_curl "${SDKMAN_CANDIDATES_API}/selfupdate/beta/${SDKMAN_PLATFORM}" | bash

0 commit comments

Comments
 (0)