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-10 18:40:33 -0500 |
| commit | e39ced239b8e84ff46758cb4ec6cffcd403088a2 (patch) | |
| tree | 18ceb048ae519d55b057b2b802ce6ca8362642b7 | |
| parent | 0a4cd2fd80169cff0b485f233f41270f5a381f11 (diff) | |
| download | vyatta-op-e39ced239b8e84ff46758cb4ec6cffcd403088a2.tar.gz vyatta-op-e39ced239b8e84ff46758cb4ec6cffcd403088a2.zip | |
Fix up completion for 'monitor firewall'
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]\]" |