From 35cd558822cf505d3bf810775b7f78557ac467ba Mon Sep 17 00:00:00 2001
From: John Southworth <john.southworth@vyatta.com>
Date: Wed, 27 Jul 2011 16:11:41 -0500
Subject: Bugfix 7380: fix pager exceptions regex.

---
 etc/bash_completion.d/vyatta-op-run | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'etc')

diff --git a/etc/bash_completion.d/vyatta-op-run b/etc/bash_completion.d/vyatta-op-run
index 053dc0e..8e73773 100644
--- a/etc/bash_completion.d/vyatta-op-run
+++ b/etc/bash_completion.d/vyatta-op-run
@@ -67,13 +67,13 @@ _vyatta_op_run ()
 
     local run_cmd=$(_vyatta_op_get_node_def_field $tpath/node.def run)
     local ret=0
+    local cmd_regex="^(LESSOPEN=|less|pager|tail|/opt/vyatta/bin/vyatta-tshark-interface-port.pl).*"
     if [ -n "$run_cmd" ]; then
-	if [[ -t 1 &&  "$1" == "show" && \
-	    ! $run_cmd =~ ^\(LESSOPEN=\|less\|pager\|tail\|/opt/vyatta/bin/vyatta-tshark-interface-port.pl\).* ]] ; then
-            eval "($run_cmd) | ${VYATTA_PAGER:-cat}"
-	else
-            eval "$run_cmd"
-	fi
+      if [[ -t 1 &&  "$1" == "show" && ! $run_cmd =~ $cmd_regex ]] ; then
+        eval "($run_cmd) | ${VYATTA_PAGER:-cat}"
+      else
+        eval "$run_cmd"
+      fi
     else
         echo "Incomplete command" >&2
         ret=1
-- 
cgit v1.2.3