From 35dc8040e0d238b69d8bd8bd9f3001afbf618a31 Mon Sep 17 00:00:00 2001
From: John Southworth <john.southworth@vyatta.com>
Date: Mon, 10 Oct 2011 18:31:10 -0500
Subject: Fix up completion for 'show log firewall' (cherry picked from commit
 0a4cd2fd80169cff0b485f233f41270f5a381f11)

---
 templates/show/log/firewall/ipv6-name/node.tag/node.def               | 2 +-
 templates/show/log/firewall/ipv6-name/node.tag/rule/node.tag/node.def | 4 ++--
 templates/show/log/firewall/name/node.tag/node.def                    | 2 +-
 templates/show/log/firewall/name/node.tag/rule/node.tag/node.def      | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'templates')

diff --git a/templates/show/log/firewall/ipv6-name/node.tag/node.def b/templates/show/log/firewall/ipv6-name/node.tag/node.def
index 0be0d86..26a8a88 100644
--- a/templates/show/log/firewall/ipv6-name/node.tag/node.def
+++ b/templates/show/log/firewall/ipv6-name/node.tag/node.def
@@ -1,5 +1,5 @@
 help: Show log for a specified firewall
 allowed: local -a ARR=$(cli-shell-api -- listEffectiveNodes firewall ipv6-name)
-         echo "${ARR[@]}"
+          echo "${ARR[@]//\'/}"
 run: cat $(printf "%s\n" /var/log/messages* | sort -nr) | grep -e "\[$5-[0-9]*-[A,D,R]\]"
 
diff --git a/templates/show/log/firewall/ipv6-name/node.tag/rule/node.tag/node.def b/templates/show/log/firewall/ipv6-name/node.tag/rule/node.tag/node.def
index 6034aa7..8a04c9b 100644
--- a/templates/show/log/firewall/ipv6-name/node.tag/rule/node.tag/node.def
+++ b/templates/show/log/firewall/ipv6-name/node.tag/rule/node.tag/node.def
@@ -1,4 +1,4 @@
 help: Show log for 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=$(cli-shell-api -- listEffectiveNodes firewall ipv6-name ${COMP_WORDS[4]} rule)
+          echo "${ARR[@]//\'/}"
 run: cat $(printf "%s\n" /var/log/messages* | sort -nr) | grep -e "\[$5-$7-[A,D,R]\]"
diff --git a/templates/show/log/firewall/name/node.tag/node.def b/templates/show/log/firewall/name/node.tag/node.def
index 40d7d03..8de2a42 100644
--- a/templates/show/log/firewall/name/node.tag/node.def
+++ b/templates/show/log/firewall/name/node.tag/node.def
@@ -1,5 +1,5 @@
 help: Show log for a specified firewall
 allowed: local -a ARR=$(cli-shell-api -- listEffectiveNodes firewall name)
-         echo "${ARR[@]}"
+          echo "${ARR[@]//\'/}"
 run: cat $(printf "%s\n" /var/log/messages* | sort -nr ) | grep -e "\[$5-[0-9]*-[A,D,R]\]"
 
diff --git a/templates/show/log/firewall/name/node.tag/rule/node.tag/node.def b/templates/show/log/firewall/name/node.tag/rule/node.tag/node.def
index bac7f64..41d4a12 100644
--- a/templates/show/log/firewall/name/node.tag/rule/node.tag/node.def
+++ b/templates/show/log/firewall/name/node.tag/rule/node.tag/node.def
@@ -1,5 +1,5 @@
 help: Show log for 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=$(cli-shell-api -- listEffectiveNodes firewall name ${COMP_WORDS[4]} rule)
+          echo "${ARR[@]//\'/}"
 run: cat $(printf "%s\n" /var/log/messages* | sort -nr) | grep -e "\[$5-$7-[A,D,R]\]"
 
-- 
cgit v1.2.3