Changeset 331 for branches

Timestamp:

05/06/2009 21:08:30 (3 years ago)

Author:

ccowart

Message:

Merging completion re-enable from trunk.

Location:

branches/confman-1.9

Files:

• . (modified) (1 prop)
• Makefile.am (modified) (3 diffs)
• abspath.in (modified) (1 prop)
• conflock.in (modified) (1 prop)
• confman_completion.in (modified) (1 diff)
• confmanlib.sh.in (modified) (1 prop)

branches/confman-1.9/Makefile.am

@@ -1 @@
-#bashcompdir = $(sysconfdir)/bash_completion.d
+bashcompdir = $(sysconfdir)/bash_completion.d
 pkglibexecdir = $(libexecdir)/confman
 sysconfdefaultsdir = $(sysconfdir)/defaults
@@ -9 +9 @@
 sysconf_DATA = confman.conf.sample
 sysconfdefaults_DATA = confman.conf
-#bashcomp_DATA = confman_completion
+bashcomp_DATA = confman_completion
 man_MANS = confman.8 confman.conf.5
 dist_man_MANS = confadmin.8 \
@@ -22 +22 @@
                 $(sysconfdefaults_DATA) \
                 $(man_MANS)
-#               $(bashcomp_DATA)
+                $(bashcomp_DATA)
 
 EXTRA_DIST = abspath.in \

branches/confman-1.9/confman_completion.in

@@ -87 +87 @@
                 return 0
         elif [ `expr "${mod_cmds}" : ".*\(${prev}\).*"` ] ; then
-                local modules=$(grep -vE '^#|^$' $RECIPE_PATH | tr '\n' ' ')
+                local modules=$(confman recipe print $(confman recipe get) | \
+            grep -vE '^#|^$' $RECIPE_PATH | tr '\n' ' ')
                 COMPREPLY=($(compgen -W "${modules}" -- ${cur}))
                 return 0