diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2011-01-24 15:34:23 +1000 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2011-01-24 15:34:23 +1000 |
| commit | 7afbca72c1dfaf273eb366b2b372855ac1505440 (patch) | |
| tree | 30e5474906ec132b250edae9801c408cb3f8c913 /etc/bash_completion.d | |
| parent | 3c9d639f65240d1745b6186a16ce0f6eb918e65c (diff) | |
| parent | 73dfd3113cfb1226366023ef61cae7c870b6159f (diff) | |
| download | vyatta-op-mendocino.tar.gz vyatta-op-mendocino.zip | |
Merge branch 'mendocino' of suva.vyatta.com:/git/vyatta-op into mendocinomendocino
Diffstat (limited to 'etc/bash_completion.d')
| -rw-r--r-- | etc/bash_completion.d/vyatta-op (renamed from etc/bash_completion.d/10vyatta-op) | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/etc/bash_completion.d/10vyatta-op b/etc/bash_completion.d/vyatta-op index 6336038..49b6768 100644 --- a/etc/bash_completion.d/10vyatta-op +++ b/etc/bash_completion.d/vyatta-op @@ -1,3 +1,4 @@ +# vyatta bash operational mode completion # **** License **** # This program is free software; you can redistribute it and/or modify @@ -76,9 +77,25 @@ _vyatta_op_debug () done } +# this is needed to provide original "default completion" behavior. +# see "vyatta-cfg" completion script for details. +_vyatta_op_default_expand () +{ + local wc=${#COMP_WORDS[@]} + if (( wc < 2 )); then + _vyatta_op_expand + else + # after the first word => cannot be vyatta command so use original default + compopt -o filenames + _filedir_xspec + fi +} + _vyatta_op_init () { - complete -F _vyatta_op_expand '' + # empty and default line compeletion + complete -E -F _vyatta_op_expand + complete -D -F _vyatta_op_default_expand for xd in $vyatta_op_templates/* ; do if [ -d $xd ] ; then |