diff options
| author | John Southworth <john.southworth@vyatta.com> | 2011-10-10 18:40:33 -0500 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2011-10-27 17:11:30 -0500 |
| commit | 63db041ce8cd7962d3d670563cfd0d53aec27a35 (patch) | |
| tree | 8109a76773ccbf8431aca5a0451f8705de7ddb95 | |
| parent | 35dc8040e0d238b69d8bd8bd9f3001afbf618a31 (diff) | |
| download | vyatta-op-63db041ce8cd7962d3d670563cfd0d53aec27a35.tar.gz vyatta-op-63db041ce8cd7962d3d670563cfd0d53aec27a35.zip | |
Fix up completion for 'monitor firewall'
(cherry picked from commit e39ced239b8e84ff46758cb4ec6cffcd403088a2)
4 files changed, 12 insertions, 8 deletions
diff --git a/templates/monitor/firewall/ipv6-name/node.tag/node.def b/templates/monitor/firewall/ipv6-name/node.tag/node.def index 3082c29..dfd71e8 100644 --- a/templates/monitor/firewall/ipv6-name/node.tag/node.def +++ b/templates/monitor/firewall/ipv6-name/node.tag/node.def @@ -1,4 +1,5 @@ help: Monitor a specified firewall -allowed: local -a ARR=$(cli-shell-api -- listEffectiveNodes firewall ipv6-name) - echo "${ARR[@]}" +allowed: local -a ARR + eval "ARR=($(cli-shell-api -- listEffectiveNodes firewall ipv6-name))" + echo ${ARR[@]} run: ${vyatta_bindir}/vyatta-monitor Firewall-ipv6-$4 "\[$4-[0-9]*-[A,D,R]\]" diff --git a/templates/monitor/firewall/ipv6-name/node.tag/rule/node.tag/node.def b/templates/monitor/firewall/ipv6-name/node.tag/rule/node.tag/node.def index 991a285..0c1ecb6 100644 --- a/templates/monitor/firewall/ipv6-name/node.tag/rule/node.tag/node.def +++ b/templates/monitor/firewall/ipv6-name/node.tag/rule/node.tag/node.def @@ -1,4 +1,5 @@ help: Monitor a rule in the specified firewall -allowed: local -a ARR=$(cli-shell-api -- listEffectiveNodes firewall ipv6-name ${COMP_WORDS[3]} rule) - echo "${ARR[@]}" +allowed: local -a ARR + eval "ARR=($(cli-shell-api -- listEffectiveNodes firewall ipv6-name ${COMP_WORDS[3]} rule))" + echo ${ARR[@]} run: ${vyatta_bindir}/vyatta-monitor Firewall-ipv6-$4-rule-$6 "\[$4-$6-[A,D,R]\]" diff --git a/templates/monitor/firewall/name/node.tag/node.def b/templates/monitor/firewall/name/node.tag/node.def index 3bb9d7f..4b31405 100644 --- a/templates/monitor/firewall/name/node.tag/node.def +++ b/templates/monitor/firewall/name/node.tag/node.def @@ -1,4 +1,5 @@ help: Monitor a specified firewall -allowed: local -a ARR=$(cli-shell-api -- listEffectiveNodes firewall name) - echo "${ARR[@]}" +allowed: local -a ARR + eval "ARR=($(cli-shell-api -- listEffectiveNodes firewall name))" + echo ${ARR[@]} run: ${vyatta_bindir}/vyatta-monitor Firewall-$4 "\[$4-[0-9]*-[A,D,R]\]" diff --git a/templates/monitor/firewall/name/node.tag/rule/node.tag/node.def b/templates/monitor/firewall/name/node.tag/rule/node.tag/node.def index ccd865d..7f15ed0 100644 --- a/templates/monitor/firewall/name/node.tag/rule/node.tag/node.def +++ b/templates/monitor/firewall/name/node.tag/rule/node.tag/node.def @@ -1,4 +1,5 @@ help: Monitor a rule in the specified firewall -allowed: local -a ARR=$(cli-shell-api -- listEffectiveNodes firewall name ${COMP_WORDS[3]} rule) - echo "${ARR[@]}" +allowed: local -a ARR + eval "ARR=($(cli-shell-api -- listEffectiveNodes firewall name ${COMP_WORDS[3]} rule))" + echo ${ARR[@]} run: ${vyatta_bindir}/vyatta-monitor Firewall-$4-rule-$6 "\[$4-$6-[A,D,R]\]" |