[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, next, updated. fdb6503c66bbafea8e92a86c26fa2653ee503253

[Arno Töll]

The following commit has been merged in the next branch:
commit c8327724a10b173ccb0efa3f8b1bdc63717c71f8
Author: Jean-Michel Vourgère <jmv_deb at nirgal.com>
Date:   Fri Feb 24 22:02:27 2012 +0100

    bash_completion: Support for a2(en|dis)conf
    
    Signed-off-by: Arno Töll <debian at toell.net>

diff --git a/debian/bash_completion/apache2-common b/debian/bash_completion/apache2-common
index 0204589..e57c100 100644
--- a/debian/bash_completion/apache2-common
+++ b/debian/bash_completion/apache2-common
@@ -1,5 +1,4 @@
 # bash completion for Debian apache2 configuration tools
-# $Id: apache2,v 1.1 2005/03/16 22:51:19 guillaume Exp $
 
 _apache2_allcomp()
 {
@@ -17,6 +16,12 @@ _apache2_sites()
        COMPREPLY=( $( compgen -W '$( _apache2_allcomp $1 )' -- $cur  ) )
 }
 
+_apache2_conf()
+{
+       COMPREPLY=( $( compgen -W '$( _apache2_allcomp $1 \
+               | sed -e 's/[.]conf$//' )' -- $cur  ) )
+}
+
 _a2enmod()
 {
        local cur
@@ -36,10 +41,20 @@ _a2ensite()
        cur=${COMP_WORDS[COMP_CWORD]}
 
        _apache2_sites sites-available
-
 }
 complete -F _a2ensite a2ensite
 
+_a2enconf()
+{
+       local cur
+
+       COMPREPLY=()
+       cur=${COMP_WORDS[COMP_CWORD]}
+
+       _apache2_conf conf-available
+}
+complete -F _a2enconf a2enconf
+
 _a2dismod()
 {
        local cur
@@ -59,6 +74,16 @@ _a2dissite()
        cur=${COMP_WORDS[COMP_CWORD]}
 
        _apache2_sites sites-enabled
-
 }
 complete -F _a2dissite a2dissite
+
+_a2disconf()
+{
+       local cur
+
+       COMPREPLY=()
+       cur=${COMP_WORDS[COMP_CWORD]}
+
+       _apache2_conf conf-enabled
+}
+complete -F _a2disconf a2disconf

-- 
Debian packaging for apache2 (Apache HTTPD 2.x)