mirror/sdkman-cli
1
0
Fork 0
mirror of https://github.com/sdkman/sdkman-cli.git synced 2026-04-17 13:38:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Tighten up return code on candidate installation.

Browse Source
This commit is contained in:
Marco Vermeulen
2019-07-12 14:30:59 +01:00
parent 5a59bb1db5
commit 1fe19fefae
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@ function __sdk_install {
if [[ -d "${SDKMAN_CANDIDATES_DIR}/${candidate}/${VERSION}" || -h "${SDKMAN_CANDIDATES_DIR}/${candidate}/${VERSION}" ]]; then
echo ""
__sdkman_echo_red "Stop! ${candidate} ${VERSION} is already installed."
return 0
return 1
fi
if [[ ${VERSION_VALID} == 'valid' ]]; then

9
src/test/cucumber/install_candidate.feature
View File

@@ -12,14 +12,16 @@ Feature: Install Candidate
Then I see "Done installing!"
And I do not see "Do you want grails 2.1.0 to be set as default? (Y/n)"
And the candidate "grails" version "2.1.0" is installed
And the exit code is 0
Scenario: Install a specific Candidate and set to default
Given the system is bootstrapped
And the candidate "grails" version "1.3.9" is available for download
When I enter "sdk install grails 1.3.9"
Then I see "Done installing!"
And I do not see "Do you want grails 2.1.0 to be set as default? (Y/n)"
And I do not see "Do you want grails 1.3.9 to be set as default? (Y/n)"
And the candidate "grails" version "1.3.9" is installed
And the exit code is 0
Scenario: Install a Candidate version that does not exist
Given the system is bootstrapped
@@ -34,6 +36,7 @@ Feature: Install Candidate
And the candidate "grails" version "1.3.9" is already installed and default
When I enter "sdk install grails 1.3.9"
Then I see "Stop! grails 1.3.9 is already installed."
And the exit code is 1
Scenario: Install a candidate and auto-answer to make it default
Given the system is bootstrapped
@@ -45,6 +48,7 @@ Feature: Install Candidate
And I see "Done installing!"
And I see "Setting grails 2.1.0 as default."
And the candidate "grails" version "2.1.0" should be the default
And the exit code is 0
Scenario: Install a candidate and choose to make it default
Given the candidate "grails" version "1.3.9" is already installed and default
@@ -57,6 +61,7 @@ Feature: Install Candidate
And I see "Setting grails 2.1.0 as default."
And the candidate "grails" version "2.1.0" should be the default
And the candidate "grails" version "1.3.9" should not be the default
And the exit code is 0
Scenario: Install a candidate and choose not to make it default
Given the candidate "grails" version "1.3.9" is already installed and default
@@ -69,6 +74,7 @@ Feature: Install Candidate
And I do not see "Setting grails 2.1.0 as default."
And the candidate "grails" version "2.1.0" should not be the default
And the candidate "grails" version "1.3.9" should be the default
And the exit code is 0
#revisit to redownload automatically
Scenario: Abort installation on download of a corrupt Candidate archive
@@ -79,3 +85,4 @@ Feature: Install Candidate
Then I see "Stop! The archive was corrupt and has been removed! Please try installing again."
And the candidate "grails" version "1.3.6" is not installed
And the archive for candidate "grails" version "1.3.6" is removed
And the exit code is 1