diff options
| author | An-Cheng Huang <ancheng@vyatta.com> | 2010-09-14 13:33:14 -0700 |
|---|---|---|
| committer | An-Cheng Huang <ancheng@vyatta.com> | 2010-09-14 13:33:14 -0700 |
| commit | 4b1c816b9451befaa1d21e6384f95b1a28668bd5 (patch) | |
| tree | 2bbac70d56b5f4908b39a0263b7f8542598fc14b | |
| parent | e8e005f8c905ece4ffd4ea3596ac6567b49f0a36 (diff) | |
| download | vyatta-op-4b1c816b9451befaa1d21e6384f95b1a28668bd5.tar.gz vyatta-op-4b1c816b9451befaa1d21e6384f95b1a28668bd5.zip | |
fix for bug 6194
* only do key bindings for vbash
| -rw-r--r-- | etc/bash_completion.d/10vyatta-op | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/etc/bash_completion.d/10vyatta-op b/etc/bash_completion.d/10vyatta-op index c69c40f..6336038 100644 --- a/etc/bash_completion.d/10vyatta-op +++ b/etc/bash_completion.d/10vyatta-op @@ -36,11 +36,14 @@ declare -x VYATTA_PAGER=$_vyatta_default_pager _vyatta_op_do_key_bindings () { - if [ "$SHELL" == "/bin/vbash" ]; then - # only do this if vbash - bind '"?": possible-completions' + if [ "$SHELL" != "/bin/vbash" ]; then + # only do bindings if vbash + return fi + bind '"?": possible-completions' + bind 'set show-all-if-ambiguous on' + nullglob_save=$(shopt -p nullglob) shopt -u nullglob bind_cmds=$(grep '^bind .* # vyatta key binding$' $HOME/.bashrc) @@ -85,7 +88,6 @@ _vyatta_op_init () fi done - bind 'set show-all-if-ambiguous on' shopt -s histverify } |