Merge pull request #455 from Bash-it/update-vagrant-completion

Updated vagrant bash completion
pull/454/merge
Nils Winkler 2015-04-22 07:54:32 +02:00
commit 7e5e2d9513
1 changed files with 12 additions and 2 deletions

View File

@ -70,8 +70,13 @@ _vagrant() {
return 0 return 0
;; ;;
"up") "up")
vagrant_state_file=$(__vagrantinvestigate) || return 1
if [[ -d $vagrant_state_file ]]
then
vm_list=$(find $vagrant_state_file/machines -mindepth 1 -maxdepth 1 -type d -exec basename {} \;)
fi
local up_commands="--no-provision" local up_commands="--no-provision"
COMPREPLY=($(compgen -W "${up_commands}" -- ${cur})) COMPREPLY=($(compgen -W "${up_commands} ${vm_list}" -- ${cur}))
return 0 return 0
;; ;;
"ssh"|"provision"|"reload"|"halt"|"suspend"|"resume"|"ssh-config") "ssh"|"provision"|"reload"|"halt"|"suspend"|"resume"|"ssh-config")
@ -113,6 +118,12 @@ _vagrant() {
then then
action="${COMP_WORDS[COMP_CWORD-2]}" action="${COMP_WORDS[COMP_CWORD-2]}"
case "$action" in case "$action" in
"up")
if [ "$prev" == "--no-provision" ]; then
COMPREPLY=($(compgen -W "${vm_list}" -- ${cur}))
return 0
fi
;;
"box") "box")
case "$prev" in case "$prev" in
"remove"|"repackage") "remove"|"repackage")
@ -134,4 +145,3 @@ _vagrant() {
fi fi
} }
complete -F _vagrant vagrant complete -F _vagrant vagrant