Reorganize the bash completion and command interpreter scripts into easier to manage chunks. vyatta-op-run no longer exists in /etc/bash_completion.d/ as it is not a completion script it should not be here

1 files changed, 9 insertions, 169 deletions

diff --git a/etc/bash_completion.d/vyatta-op b/etc/bash_completion.d/vyatta-op
index b1f8643..340c316 100644
--- a/etc/bash_completion.d/vyatta-op
+++ b/etc/bash_completion.d/vyatta-op
@@ -1,5 +1,4 @@
 # vyatta bash operational mode completion
-
 # **** License ****
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 as
@@ -73,7 +72,14 @@ if [[ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/users" ]]; then
    _vyatta_operator_allowed=( $(cat /opt/vyatta/etc/shell/level/users/allowed-op) )
 fi
 
-source /etc/bash_completion.d/vyatta-op-run
+#source /etc/bash_completion.d/vyatta-op-run
+
+declare -a functions
+functions=( /opt/vyatta/share/vyatta-op/functions/interpreter/* )
+
+for file in "${functions[@]}";do
+  source $file;
+done
 
 # $1: label
 # #2...: strings
@@ -86,21 +92,6 @@ _vyatta_op_debug ()
     done
 }
 
-_vyatta_op_is_elem_of () {
-  local elem=$1
-  local -a olist
-  eval "olist=( \"\${$2[@]}\" )"
-  for e in ${olist[*]}; do
-    if [[ "$e" == "$elem" ]]; then
-      echo -n '1'
-      return
-    fi
-  done
-  echo -n '0'
-  return
-}
-
-
 # this is needed to provide original "default completion" behavior.
 # see "vyatta-cfg" completion script for details.
 _vyatta_op_default_expand ()
@@ -115,29 +106,6 @@ _vyatta_op_default_expand ()
   fi
 }
 
-_vyatta_op_init ()
-{
-    # empty and default line compeletion
-    complete -E -F _vyatta_op_expand 
-    complete -D -F _vyatta_op_default_expand
-
-    # create the top level aliases for the unambiguous portions of the commands
-    # this is the only place we need an entire enumerated list of the subcommands
-    for cmd in $( ls /opt/vyatta/share/vyatta-op/templates/ ); do
-      for pos in $(seq 1 ${#cmd}); do  
-        case ${cmd:0:$pos} in  
-          for|do|done|if|fi|case|while|tr )
-            continue ;;
-          *) ;;
-        esac
-        complete -F _vyatta_op_expand ${cmd:0:$pos}
-        eval alias ${cmd:0:$pos}=\'_vyatta_op_run ${cmd:0:$pos}\' 
-      done 
-    done
-
-    shopt -s histverify
-}
-
 # $1: label
 # $2...: help
 _vyatta_op_print_help ()
@@ -245,7 +213,7 @@ _vyatta_op_set_completions ()
 	else
       if [[ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/admin" ]]; then
 	      completions+=( ${allowed[i]} )
-      elif [[ $(_vyatta_op_is_elem_of ${allowed[i]} _vyatta_operator_allowed) == "1" ]];then
+      elif is_elem_of ${allowed[i]} _vyatta_operator_allowed; then
         completions+=( ${allowed[i]} )
       elif [[ $_vyatta_op_node_path == $vyatta_op_templates ]];then
         continue
@@ -463,130 +431,6 @@ _vyatta_set_comptype ()
     done
 }
 
-_vyatta_image_is_file()
-{
-  local cur=$1
-  cur=${cur/:/}
-  topdir=${cur%%/*}
-  cur=${cur#$topdir/}
-  if [[ $topdir == "running" ]]; then
-    cur="/${cur}"
-  elif [[ $topdir == "disk-install" ]]; then
-    cur="/live/image/${cur}"
-  else
-    cur="/live/image/boot/${topdir}/live-rw/${cur}"
-  fi  
-  if [[ -f ${cur} ]]; then
-    return 0;
-  else
-    return 1;
-  fi  
-}
-
-_vyatta_image_file_complete()
-{
-  if _vyatta_image_is_file ${COMP_WORDS[(( ${#COMP_WORDS[@]}-2 ))]}; then
-    _vyatta_op_completions=( "" " " )
-    return 0;
-  fi
-  _vyatta_image_path_complete
-}
-
-_vyatta_image_path_complete()
-{
-  compopt -o nospace
-  local -a reply
-  if _vyatta_image_is_file $cur ; then
-    foundfile=1
-    _vyatta_op_completions=( "${cur} " )
-    return 0;
-  fi
-  if [[ ${cur} == "" ]]; then
-    reply=( $(compgen -d /live/image/boot/ | grep -v grub) )
-    for i in `seq 0 $[${#reply[@]}-1]`; do
-      file=${reply[$i]}
-      reply[$i]=${file/#\/live\/image\/boot\//}
-      reply[$i]="${reply[$i]}://config/"
-    done
-    reply+=( "running://config/" )
-    if [[ -d /live/image/opt/vyatta/etc/config || -d /live/image/config ]]; then
-      reply+=( "disk-install://" )
-    fi
-  else 
-    if ! [[ $cur =~ .*:\/\/ ]]; then
-      if [[ $cur =~ .*:\/ ]]; then
-        cur=${cur/:\//}
-      fi
-      if [[ $cur =~ .*: ]]; then
-        cur=${cur/:/}
-      fi
-      local isrunningimg=$(compgen -W "running" -- ${cur})
-      local isdiskinstall=$(compgen -W "disk-install" -- ${cur})
-      if [[ $isrunningimg == "running" ]];then
-        cur="/"
-      elif [[ $isdiskinstall == "disk-install" ]]; then
-        cur="/live/image/"
-      else
-        cur="/live/image/boot/${cur}"
-      fi
-      reply=( $(compgen -f ${cur}) )
-      for i in `seq 0 $[${#reply[@]}-1]`; do
-        file=${reply[$i]}
-        if [[ $isrunningimg == "running" ]];then
-          reply[$i]="running://config/"
-        elif [[ $isdiskinstall == "disk-install" ]]; then
-          reply[$i]="disk-install://" 
-        else
-          reply[$i]=${file/#\/live\/image\/boot\//}
-          if [[ -d /live/image/boot/${reply[$i]} ]]; then
-            reply[$i]="${reply[$i]/#\//}://config/"
-          fi
-        fi
-      done
-    else
-      cur=${cur/:/}
-      topdir=${cur%%/*}
-      cur=${cur#$topdir//}
-      if [[ $topdir == "running" ]]; then
-        cur="/${cur}"
-      elif [[ $topdir == "disk-install" ]]; then
-        cur="/live/image/${cur}"
-      else
-        cur="/live/image/boot/${topdir}/live-rw/${cur}"
-      fi
-      reply=( $(compgen -f ${cur}) )
-      # for loop from _filedirs() in /etc/bash_completion
-      for ((i=0; i < ${#reply[@]}; i++)); do
-        if [[ ${cur:0:1} != "'" ]]; then 
-           [[ -d ${reply[i]} ]] && reply[i]="${reply[i]}"/
-           if [[ ${cur:0:1} == '"' ]]; then 
-             reply[i]=${reply[i]//\\/\\\\}
-             reply[i]=${reply[i]//\"/\\\"}
-             reply[i]=${reply[i]//\$/\\\$}
-           else
-             reply[i]=$(printf %q ${reply[i]})
-           fi
-        fi
-      done
-      for i in `seq 0 $[${#reply[@]}-1]`; do
-        file=${reply[$i]}
-        if [[ $topdir == "running" ]]; then
-          reply[$i]=${file/#\//"$topdir://"}
-        elif [[ $topdir == "disk-install" ]]; then
-          reply[$i]=${file/#\/live\/image\//$"$topdir://"} 
-        else
-          reply[$i]=${file/#\/live\/image\/boot\/$topdir/"$topdir://"}
-          reply[$i]=${reply[$i]/\/live-rw\/}
-        fi
-      done
-    fi 
-  fi
-  _vyatta_op_completions=( "${reply[@]}" )
-  return 0
-}
-
-
-
 nullglob_save=$( shopt -p nullglob )
 shopt -s nullglob
 for f in ${vyatta_datadir}/vyatta-op/functions/allowed/* ; do
@@ -602,10 +446,6 @@ fi
 
 _vyatta_op_init $@
 
-if [[ "$VYATTA_USER_LEVEL_DIR" == "/opt/vyatta/etc/shell/level/users" ]]; then
-  PS1='\u@\h> '
-fi
-
 ###  Local Variables:
 ###  mode: shell-script
 ###  End: