summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2008-03-03 14:49:45 -0800
committerStephen Hemminger <stephen.hemminger@vyatta.com>2008-03-03 14:49:45 -0800
commit749d4dc1be7e461610eaa72bdb8d2ca8b119d380 (patch)
tree99cfdd43acc9bdacb99d2a9f310178d1e7cc1703 /etc
parent4f853fd987692eee16faf344e293d4aa1f6bfb18 (diff)
parent896e4ffb90951fbfac777683f1d7fdc8aa2c7b22 (diff)
downloadvyatta-op-749d4dc1be7e461610eaa72bdb8d2ca8b119d380.tar.gz
vyatta-op-749d4dc1be7e461610eaa72bdb8d2ca8b119d380.zip
Merge branch 'glendale' of http://suva.vyatta.com/vyatta-op into glendale
Diffstat (limited to 'etc')
-rw-r--r--etc/bash_completion.d/10vyatta-op17
1 files changed, 15 insertions, 2 deletions
diff --git a/etc/bash_completion.d/10vyatta-op b/etc/bash_completion.d/10vyatta-op
index 4eb5ba2..0af8f0c 100644
--- a/etc/bash_completion.d/10vyatta-op
+++ b/etc/bash_completion.d/10vyatta-op
@@ -35,8 +35,21 @@ test -z "$_vyatta_default_pager" && \
--no-lessopen"
declare -x VYATTA_PAGER=$_vyatta_default_pager
-# use '?' for help
-bind '"?": possible-completions'
+_vyatta_op_do_key_bindings ()
+{
+ if [ "$SHELL" == "/bin/vbash" ]; then
+ # only do this if vbash
+ bind '"?": possible-completions'
+ fi
+
+ nullglob_save=$(shopt -p nullglob)
+ shopt -u nullglob
+ bind_cmds=$(grep '^bind .* # vyatta key binding$' $HOME/.bashrc)
+ eval $bind_cmds
+ eval $nullglob_save
+}
+
+_vyatta_op_do_key_bindings
test -f /etc/default/vyatta && \
source /etc/default/vyatta