Merge branch 'glendale' of http://suva.vyatta.com/vyatta-op into glendale

23 files changed, 46 insertions, 20 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
diff --git a/templates/configure/node.def b/templates/configure/node.def
index 67e17af..5d30510 100644
--- a/templates/configure/node.def
+++ b/templates/configure/node.def
@@ -1,2 +1,3 @@
 help: Enter configure mode
 run: export _OFR_CONFIGURE=ok; newgrp vyattacfg; unset _OFR_CONFIGURE
+     _vyatta_op_do_key_bindings
diff --git a/templates/show/bridge/node.tag/macs/node.def b/templates/show/bridge/node.tag/macs/node.def
index cbf77da..598a209 100644
--- a/templates/show/bridge/node.tag/macs/node.def
+++ b/templates/show/bridge/node.tag/macs/node.def
@@ -1,2 +1,2 @@
 help: Show bridge MAC table
-run: brctl showmacs $3
+run: brctl showmacs "$3"
diff --git a/templates/show/bridge/node.tag/node.def b/templates/show/bridge/node.tag/node.def
index 770165e..0b4f163 100644
--- a/templates/show/bridge/node.tag/node.def
+++ b/templates/show/bridge/node.tag/node.def
@@ -2,4 +2,4 @@ help: Show bridge information for a given bridge
 allowed: local -a array ;
 	 array=( /sys/class/net/br* ) ;
 	 echo  -n ${array[@]##*/}
-run: brctl show $3
+run: brctl show "$3"
diff --git a/templates/show/bridge/node.tag/spanning-tree/node.def b/templates/show/bridge/node.tag/spanning-tree/node.def
index 33d16d9..b3e06e8 100644
--- a/templates/show/bridge/node.tag/spanning-tree/node.def
+++ b/templates/show/bridge/node.tag/spanning-tree/node.def
@@ -1,2 +1,2 @@
 help: Show bridge spanning tree information
-run: brctl showstp $3
+run: brctl showstp "$3"
diff --git a/templates/show/dhcp/client/leases/interface/node.tag/node.def b/templates/show/dhcp/client/leases/interface/node.tag/node.def
index 2445d0b..5e8f7f3 100644
--- a/templates/show/dhcp/client/leases/interface/node.tag/node.def
+++ b/templates/show/dhcp/client/leases/interface/node.tag/node.def
@@ -2,4 +2,4 @@ help: Show dhcp client information for interface
 allowed: local -a array ;
          array=( /sys/class/net/eth* ) ;
          echo  -n ${array[@]##*/}
-run: /opt/vyatta/bin/vyatta-show-dhclient.pl $6
+run: /opt/vyatta/bin/vyatta-show-dhclient.pl "$6"
diff --git a/templates/show/interfaces/bridge/node.tag/brief/node.def b/templates/show/interfaces/bridge/node.tag/brief/node.def
index b277607..d3d213d 100644
--- a/templates/show/interfaces/bridge/node.tag/brief/node.def
+++ b/templates/show/interfaces/bridge/node.tag/brief/node.def
@@ -1,2 +1,2 @@
 help: Show summary of a given bridge interface information
-run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf=$4 --action=show-brief
+run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf="$4" --action=show-brief
diff --git a/templates/show/interfaces/bridge/node.tag/node.def b/templates/show/interfaces/bridge/node.tag/node.def
index 9248741..41aa6b2 100644
--- a/templates/show/interfaces/bridge/node.tag/node.def
+++ b/templates/show/interfaces/bridge/node.tag/node.def
@@ -2,4 +2,4 @@ help: Show given bridge interface information
 allowed: local -a array ;
 	 array=( /sys/class/net/br* ) ;
 	 echo  -n ${array[@]##*/}
-run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf=$4
+run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf="$4"
diff --git a/templates/show/interfaces/ethernet/node.tag/brief/node.def b/templates/show/interfaces/ethernet/node.tag/brief/node.def
index 52b3870..3340d9e 100644
--- a/templates/show/interfaces/ethernet/node.tag/brief/node.def
+++ b/templates/show/interfaces/ethernet/node.tag/brief/node.def
@@ -1,2 +1,2 @@
 help: Show given ethernet interface information
-run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf=$4 --action=show-brief
+run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf="$4" --action=show-brief
diff --git a/templates/show/interfaces/ethernet/node.tag/node.def b/templates/show/interfaces/ethernet/node.tag/node.def
index 3dab472..b41cf8b 100644
--- a/templates/show/interfaces/ethernet/node.tag/node.def
+++ b/templates/show/interfaces/ethernet/node.tag/node.def
@@ -6,4 +6,4 @@ allowed: for dev in /sys/class/net/*;
                  fi
             fi
          done
-run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf=$4
+run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf="$4"
diff --git a/templates/show/interfaces/ethernet/node.tag/vif/node.tag/brief/node.def b/templates/show/interfaces/ethernet/node.tag/vif/node.tag/brief/node.def
index 956be62..1eaa07c 100644
--- a/templates/show/interfaces/ethernet/node.tag/vif/node.tag/brief/node.def
+++ b/templates/show/interfaces/ethernet/node.tag/vif/node.tag/brief/node.def
@@ -1,2 +1,2 @@
 help: Show given virtual network interface information
-run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf=$4.$6 --action=show-brief
+run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf="$4.$6" --action=show-brief
diff --git a/templates/show/interfaces/ethernet/node.tag/vif/node.tag/node.def b/templates/show/interfaces/ethernet/node.tag/vif/node.tag/node.def
index 813637b..13f196f 100644
--- a/templates/show/interfaces/ethernet/node.tag/vif/node.tag/node.def
+++ b/templates/show/interfaces/ethernet/node.tag/vif/node.tag/node.def
@@ -2,4 +2,4 @@ help: Show given virtual network interface information
 allowed: local -a array ;
          array=( /sys/class/net/${COMP_WORDS[3]}.* ) ;
 	 echo  -n ${array[@]##*.}
-run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf=$4.$6
+run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf="$4.$6"
diff --git a/templates/show/interfaces/loopback/node.tag/brief/node.def b/templates/show/interfaces/loopback/node.tag/brief/node.def
index ca5cc37..85970d3 100644
--- a/templates/show/interfaces/loopback/node.tag/brief/node.def
+++ b/templates/show/interfaces/loopback/node.tag/brief/node.def
@@ -1,2 +1,2 @@
 help: Show summary of given loopback interface information
-run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf=$4 --action=show-brief
+run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf="$4" --action=show-brief
diff --git a/templates/show/interfaces/loopback/node.tag/node.def b/templates/show/interfaces/loopback/node.tag/node.def
index ff6eec5..84f3624 100644
--- a/templates/show/interfaces/loopback/node.tag/node.def
+++ b/templates/show/interfaces/loopback/node.tag/node.def
@@ -2,4 +2,4 @@ help: Show given loopback interface information
 allowed: local -a array ;
 	 array=( /sys/class/net/lo* ) ;
 	 echo  -n ${array[@]##*/}
-run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf=$4
+run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf="$4"
diff --git a/templates/show/interfaces/tunnel/node.tag/brief/node.def b/templates/show/interfaces/tunnel/node.tag/brief/node.def
index cf2b8da..81e2c24 100644
--- a/templates/show/interfaces/tunnel/node.tag/brief/node.def
+++ b/templates/show/interfaces/tunnel/node.tag/brief/node.def
@@ -1,2 +1,2 @@
 help: Show given tunnel interface information
-run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf=$4 --action=show-brief
+run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf="$4" --action=show-brief
diff --git a/templates/show/interfaces/tunnel/node.tag/node.def b/templates/show/interfaces/tunnel/node.tag/node.def
index 12630bd..c39ad7e 100644
--- a/templates/show/interfaces/tunnel/node.tag/node.def
+++ b/templates/show/interfaces/tunnel/node.tag/node.def
@@ -2,4 +2,4 @@ help: Show given tunnel interface information
 allowed: local -a array ;
 	 array=( /sys/class/net/tun* ) ;
 	 echo  -n ${array[@]##*/}
-run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf=$4
+run: ${vyatta_bindir}/vyatta-show-interfaces.pl --intf="$4"
diff --git a/templates/show/log/tail/node.def b/templates/show/log/tail/node.def
index 65bea1c..e6f3456 100644
--- a/templates/show/log/tail/node.def
+++ b/templates/show/log/tail/node.def
@@ -1,2 +1,2 @@
 help: Show last lines of messages file
-run: tail -f /var/log/messages
+run: tail --follow=name /var/log/messages
diff --git a/templates/show/vrrp/interface/node.tag/group/node.tag/node.def b/templates/show/vrrp/interface/node.tag/group/node.tag/node.def
index 77ab7a7..84e168f 100644
--- a/templates/show/vrrp/interface/node.tag/group/node.tag/node.def
+++ b/templates/show/vrrp/interface/node.tag/group/node.tag/node.def
@@ -1,3 +1,3 @@
 help: Show VRRP information for interface group
 allowed: echo -n '<VRRP_GROUP>'
-run: /opt/vyatta/sbin/vyatta-show-vrrp.pl $4 $6
+run: /opt/vyatta/sbin/vyatta-show-vrrp.pl "$4" "$6"
diff --git a/templates/show/vrrp/interface/node.tag/node.def b/templates/show/vrrp/interface/node.tag/node.def
index 8556884..19b323e 100644
--- a/templates/show/vrrp/interface/node.tag/node.def
+++ b/templates/show/vrrp/interface/node.tag/node.def
@@ -2,4 +2,4 @@ help: Show VRRP information for interface
 allowed: local -a array ;
          array=( /sys/class/net/eth* ) ;
          echo  -n ${array[@]##*/}
-run: /opt/vyatta/sbin/vyatta-show-vrrp.pl $4
+run: /opt/vyatta/sbin/vyatta-show-vrrp.pl "$4"
diff --git a/templates/terminal/key/node.def b/templates/terminal/key/node.def
new file mode 100644
index 0000000..3303752
--- /dev/null
+++ b/templates/terminal/key/node.def
@@ -0,0 +1 @@
+help: Configure key behaviors
diff --git a/templates/terminal/key/query-help/node.def b/templates/terminal/key/query-help/node.def
new file mode 100644
index 0000000..c15f556
--- /dev/null
+++ b/templates/terminal/key/query-help/node.def
@@ -0,0 +1 @@
+help: Enable/disable getting help using question mark
diff --git a/templates/terminal/key/query-help/node.tag/node.def b/templates/terminal/key/query-help/node.tag/node.def
new file mode 100644
index 0000000..dd27db3
--- /dev/null
+++ b/templates/terminal/key/query-help/node.tag/node.def
@@ -0,0 +1,10 @@
+help: Enable/disable getting help using question mark (default enabled)
+allowed: echo -n 'enable' 'disable'
+run: if [ "$4" == 'disable' ]; then
+       sed -i "/^bind '\"?\": .* # vyatta key binding$/d" $HOME/.bashrc
+       echo "bind '\"?\": self-insert' # vyatta key binding" >> $HOME/.bashrc
+       bind '"?": self-insert'
+     else
+       sed -i "/^bind '\"?\": .* # vyatta key binding$/d" $HOME/.bashrc
+       bind '"?": possible-completions'
+     fi
diff --git a/templates/terminal/node.def b/templates/terminal/node.def
index 85b7c7f..cdc1793 100644
--- a/templates/terminal/node.def
+++ b/templates/terminal/node.def
@@ -1 +1 @@
-help: Control terminal paging
+help: Control terminal behaviors