Skip to content

Commit fd2ed04

Browse files
committed
Fix selfupdate bug.
1 parent f61702c commit fd2ed04

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

src/main/bash/sdkman-selfupdate.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,13 @@ function __sdk_selfupdate() {
2424
echo "This command is not available while offline."
2525
elif [[ "$SDKMAN_REMOTE_VERSION" == "$SDKMAN_VERSION" && "$force_selfupdate" != "force" ]]; then
2626
echo "No update available at this time."
27+
elif [[ "$sdkman_beta_channel" == "true" ]]; then
28+
export sdkman_debug_mode
29+
__sdkman_secure_curl "${SDKMAN_CANDIDATES_API}/selfupdate/beta" | bash
2730
else
2831
export sdkman_debug_mode
29-
__sdkman_secure_curl "${SDKMAN_CANDIDATES_API}/selfupdate" | bash
32+
__sdkman_secure_curl "${SDKMAN_CANDIDATES_API}/selfupdate/stable" | bash
3033
fi
31-
32-
unset SDKMAN_FORCE_SELFUPDATE
3334
}
3435

3536
function __sdkman_auto_update() {
@@ -57,7 +58,7 @@ function __sdkman_auto_update() {
5758
fi
5859

5960
if [[ "$upgrade" == "Y" || "$upgrade" == "y" ]]; then
60-
__sdk_selfupdate
61+
__sdk_selfupdate "force"
6162
unset upgrade
6263
else
6364
__sdkman_echo_no_colour "Not upgrading today..."

src/test/groovy/sdkman/steps/stub_steps.groovy

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ And(~'^the default "([^"]*)" version is "([^"]*)"$') { String candidate, String
1717
}
1818

1919
And(~'^an available selfupdate$') { ->
20-
primeEndpointWithString("/selfupdate", 'echo "Successfully upgraded SDKMAN."')
20+
primeEndpointWithString("/selfupdate/stable", 'echo "Successfully upgraded SDKMAN."')
21+
primeEndpointWithString("/selfupdate/beta", 'echo "Successfully upgraded SDKMAN."')
2122
}
2223

2324
And(~'^the candidate "([^"]*)" version "([^"]*)" is available for download$') { String candidate, String version ->

0 commit comments

Comments
 (0)