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

Further tweaks to update command output.

Browse Source
This commit is contained in:
Marco Vermeulen
2018-07-04 00:36:44 +01:00
parent 057997b678
commit 53b574de2c
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/bash/sdkman-update.sh
View File

@@ -53,21 +53,17 @@ function __sdk_update {
local cached_candidates_length=${#SDKMAN_CANDIDATES_CSV}
__sdkman_echo_debug "Fresh and cached candidate lengths: $fresh_candidates_length $cached_candidates_length"
local diff_candidates=$(echo ${fresh_candidates[@]} ${cached_candidates[@]} | tr ' ' '\n' | sort | uniq -u | tr '\n' ',')
local diff_len=${#diff_candidates}
local diff_endindex=$(expr $diff_len - 1)
local diff_result=$(echo $diff_candidates | cut -c 1-$diff_endindex)
local diff_candidates=$(echo ${fresh_candidates[@]} ${cached_candidates[@]} | tr ' ' '\n' | sort | uniq -u | tr '\n' ' ')
if (( fresh_candidates_length > cached_candidates_length )); then
echo ""
__sdkman_echo_green "Adding new candidates(s): $diff_result"
__sdkman_echo_green "Adding new candidates(s): $diff_candidates"
echo "$fresh_candidates_csv" > "$SDKMAN_CANDIDATES_CACHE"
echo ""
__sdkman_echo_yellow "Please open a new terminal now..."
elif (( fresh_candidates_length < cached_candidates_length )); then
echo ""
__sdkman_echo_green "Removing obsolete candidates(s): $diff_result"
__sdkman_echo_green "Removing obsolete candidates(s): $diff_candidates"
echo "$fresh_candidates_csv" > "$SDKMAN_CANDIDATES_CACHE"
echo ""
__sdkman_echo_yellow "Please open a new terminal now..."

2
src/test/groovy/sdkman/specs/CandidatesCacheUpdateSpec.groovy
View File

@@ -106,7 +106,7 @@ class CandidatesCacheUpdateSpec extends SdkmanEnvSpecification {
bash.execute("sdk update")
then:
bash.output.contains('Adding new candidates(s): groovy,scala')
bash.output.contains('Adding new candidates(s): groovy scala')
and:
candidatesCache.text.trim() == "groovy,scala"