Changeset 81

Timestamp:

04/15/2006 20:20:35 (6 years ago)

Author:

yontege

Message:

The completion function is not tolerating 'source' or 'eval' while
trying to get RECIPE_PATH from the confman.conf file.

File:

• confman/bash_completions (modified) (2 diffs)

confman/bash_completions

@@ -6 +6 @@
         CONFMAN_CONF="/usr/local/rescomp/etc/confman.conf"
         CONFMAN_RC="~/.confmanrc"
-        [ -e ${CONFMAN_CONF} ] && source ${CONFMAN_CONF}
-        [ -e ${CONFMAN_RC} ] && source ${CONFMAN_RC}
+        if [ -e ${CONFMAN_CONF} ] ; then
+                RECIPE_PATH=$(grep '^RECIPE_PATH' ${CONFMAN_CONF}|cut -d'"' -f2)
+        elif [ -e ${CONFMAN_RC} ] ; then
+                RECIPE_PATH=$(grep '^RECIPE_PATH' ${CONFMAN_RC}|cut -d'"' -f2)
+        fi
         COMPREPLY=()
         cur="${COMP_WORDS[COMP_CWORD]}"
@@ -37 +40 @@
             return 0
         elif [ `expr "${mod_cmds}" : ".*\(${prev}\).*"` ] ; then
-                local modules=$(grep -vE '^#|^$' ${RECIPE_PATH} | tr '\n' ' ')
+                local modules=$(grep -vE '^#|^$' $RECIPE_PATH | tr '\n' ' ')
                 COMPREPLY=($(compgen -W "${modules}" -- ${cur}))
                 return 0