Changeset 330


Ignore:
Timestamp:
05/06/2009 20:54:38 (3 years ago)
Author:
ccowart
Message:

Re-enabling bash completions in Makefile. Telling completions how to find
modules now. Fixing up svn:ignore.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        2020confman.conf.5 
        2121confman.conf.sample 
         22confmanlib.sh 
         23abspath 
         24conflock 

  • trunk/Makefile.am

    r329 r330  
    1 #bashcompdir = $(sysconfdir)/bash_completion.d 
     1bashcompdir = $(sysconfdir)/bash_completion.d 
    22pkglibexecdir = $(libexecdir)/confman 
    33sysconfdefaultsdir = $(sysconfdir)/defaults 
    … …  
    99sysconf_DATA = confman.conf.sample 
    1010sysconfdefaults_DATA = confman.conf 
    11 #bashcomp_DATA = confman_completion 
     11bashcomp_DATA = confman_completion 
    1212man_MANS = confman.8 confman.conf.5 
    1313dist_man_MANS = confadmin.8 \ 
    … …  
    2222                $(sysconfdefaults_DATA) \ 
    2323                $(man_MANS) 
    24 #               $(bashcomp_DATA) 
     24                $(bashcomp_DATA) 
    2525 
    2626EXTRA_DIST = confman.in \ 

  • trunk/confman_completion.in

    r329 r330  
    8787                return 0 
    8888        elif [ `expr "${mod_cmds}" : ".*\(${prev}\).*"` ] ; then 
    89                 local modules=$(grep -vE '^#|^$' $RECIPE_PATH | tr '\n' ' ') 
     89                local modules=$(confman recipe print $(confman recipe get) | \ 
     90            grep -vE '^#|^$' $RECIPE_PATH | tr '\n' ' ') 
    9091                COMPREPLY=($(compgen -W "${modules}" -- ${cur})) 
    9192                return 0 
Note: See TracChangeset for help on using the changeset viewer.