Merge pull request #661 from ancho/feature/sdkman-3.3.2-version-completion

fixed version completion for sdkman 3.3.2
pull/664/head
Nils Winkler 2016-02-08 08:15:34 +01:00
commit 253fa23b53
1 changed files with 5 additions and 15 deletions

View File

@ -4,7 +4,7 @@ _sdkman_complete()
local CANDIDATE_VERSIONS local CANDIDATE_VERSIONS
COMPREPLY=() COMPREPLY=()
if [ $COMP_CWORD -eq 1 ]; then if [ $COMP_CWORD -eq 1 ]; then
COMPREPLY=( $(compgen -W "install uninstall rm list ls use current outdated version default selfupdate broadcast offline help flush" -- ${COMP_WORDS[COMP_CWORD]}) ) COMPREPLY=( $(compgen -W "install uninstall rm list ls use current outdated version default selfupdate broadcast offline help flush" -- ${COMP_WORDS[COMP_CWORD]}) )
elif [ $COMP_CWORD -eq 2 ]; then elif [ $COMP_CWORD -eq 2 ]; then
@ -35,15 +35,14 @@ _sdkman_complete()
;; ;;
esac esac
fi fi
return 0 return 0
} }
_sdkman_candidate_versions(){ _sdkman_candidate_versions(){
CANDIDATE_LOCAL_VERSIONS=$(__sdkman_cleanup_local_versions $1) CANDIDATE_LOCAL_VERSIONS=$(__sdkman_cleanup_local_versions $1)
if _sdkman_offline; then if [ "$SDKMAN_OFFLINE_MODE" = "true" ]; then
CANDIDATE_VERSIONS=$CANDIDATE_LOCAL_VERSIONS CANDIDATE_VERSIONS=$CANDIDATE_LOCAL_VERSIONS
else else
CANDIDATE_ONLINE_VERSIONS="$(curl -s "${SDKMAN_SERVICE}/candidates/$1" | tr ',' ' ')" CANDIDATE_ONLINE_VERSIONS="$(curl -s "${SDKMAN_SERVICE}/candidates/$1" | tr ',' ' ')"
@ -53,19 +52,10 @@ _sdkman_candidate_versions(){
} }
__sdkman_cleanup_local_versions(){ __sdkman_cleanup_local_versions(){
__sdkmantool_build_version_csv $1 __sdkman_build_version_csv $1
echo $CSV | tr ',' ' ' echo $CSV | tr ',' ' '
} }
_sdkman_offline()
{
if [ "$SDKMAN_ONLINE" = "true" ]; then
return 1
else
return 0
fi
}
complete -F _sdkman_complete sdk complete -F _sdkman_complete sdk