From 3a92c96ba66b256db30b5325267cb123cbe9b7b6 Mon Sep 17 00:00:00 2001
From: Kim Hagen <kim.sidney@gmail.com>
Date: Tue, 26 Jan 2016 02:27:24 -0500
Subject: Add function to bash-completion script to fix message "bad array
 subscript"

---
 etc/bash_completion.d/vyatta-op | 46 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 44 insertions(+), 2 deletions(-)

(limited to 'etc/bash_completion.d/vyatta-op')

diff --git a/etc/bash_completion.d/vyatta-op b/etc/bash_completion.d/vyatta-op
index c820305..47092a2 100644
--- a/etc/bash_completion.d/vyatta-op
+++ b/etc/bash_completion.d/vyatta-op
@@ -104,14 +104,14 @@ _vyatta_op_default_expand ()
   local wc=${#COMP_WORDS[@]}
   if [[ "${COMP_WORDS[0]}" =~ "/" ]]; then
     # if we are looking for a directory on the first completion then do directory completions
-    _filedir_xspec
+    _filedir_xspec_vyos
   elif (( wc < 2 )) ||
      [[ $COMP_CWORD -eq 0 ]] ||
      [[ $1 == $2 ]]; then
     _vyatta_op_expand "$@"
   else
     # after the first word => cannot be vyatta command so use original default
-    _filedir_xspec
+    _filedir_xspec_vyos
   fi
 }
 
@@ -599,6 +599,48 @@ _vyatta_set_comptype ()
   done
 }
 
+_filedir_xspec_vyos()
+{
+    local cur prev words cword
+    _init_completion || return
+
+    _tilde "$cur" || return 0
+
+    local IFS=$'\n' xspec=${_xspec[${1##*/}]} tmp
+    local -a toks
+
+    toks=( $(
+        compgen -d -- "$(quote_readline "$cur")" | {
+        while read -r tmp; do
+            printf '%s\n' $tmp
+        done
+        }
+        ))
+
+    # Munge xspec to contain uppercase version too
+    # http://thread.gmane.org/gmane.comp.shells.bash.bugs/15294/focus=15306
+    eval xspec="${xspec}"
+    local matchop=!
+    if [[ $xspec == !* ]]; then
+        xspec=${xspec#!}
+        matchop=@
+    fi
+    xspec="$matchop($xspec|${xspec^^})"
+
+    toks+=( $(
+        eval compgen -f -X "!$xspec" -- "\$(quote_readline "\$cur")" | {
+        while read -r tmp; do
+            [[ -n $tmp ]] && printf '%s\n' $tmp
+        done
+        }
+        ))
+
+    if [[ ${#toks[@]} -ne 0 ]]; then
+        compopt -o filenames
+        COMPREPLY=( "${toks[@]}" )
+    fi
+}
+
 nullglob_save=$( shopt -p nullglob )
 shopt -s nullglob
 for f in ${vyatta_datadir}/vyatta-op/functions/allowed/* ; do
-- 
cgit v1.2.3


From b9c3925b1f68534b51f4d2f2b239ae7cdd2ef030 Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@baturin.org>
Date: Tue, 5 Jun 2018 20:48:32 +0200
Subject: T684: make the 'run show configuration commands' and the |commands
 pipe use the new implementation.

---
 etc/bash_completion.d/vyatta-op                | 2 +-
 templates/show/configuration/commands/node.def | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'etc/bash_completion.d/vyatta-op')

diff --git a/etc/bash_completion.d/vyatta-op b/etc/bash_completion.d/vyatta-op
index 47092a2..d917806 100644
--- a/etc/bash_completion.d/vyatta-op
+++ b/etc/bash_completion.d/vyatta-op
@@ -500,7 +500,7 @@ strip-private ()
 commands ()
 {
   if [ "$_OFR_CONFIGURE" != "" ]; then
-      ${vyatta_sbindir}/vyatta-config-gen-sets.pl -
+      ${vyos_libexec_dir}/commands-pipe.py
   else
       echo "commands pipe is not supported in operational mode"
   fi
diff --git a/templates/show/configuration/commands/node.def b/templates/show/configuration/commands/node.def
index a2d55cf..f2e047e 100644
--- a/templates/show/configuration/commands/node.def
+++ b/templates/show/configuration/commands/node.def
@@ -1,7 +1,7 @@
 help: Show running configuration as set commands
 run: if [ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ]; 
      then
-        ${vyatta_sbindir}/vyatta-config-gen-sets.pl
+        cli-shell-api showCfg --show-active-only | vyos-config-to-commands
      else
         echo Must be an admin user to run this command.
      fi
-- 
cgit v1.2.3