[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 1.3-245-g43728af

[David Paleino]

The following commit has been merged in the master branch:
commit 43728af423f98499e6e7c55480ead524452fadbc
Author: David Paleino <dapal at debian.org>
Date:   Mon May 2 18:37:49 2011 +0200

    Get rid of BASH_COMPLETION_DIR and BASH_COMPLETION_HELPERS_DIR

diff --git a/bash_completion b/bash_completion
index 9be04a1..1459d2c 100644
--- a/bash_completion
+++ b/bash_completion
@@ -40,10 +40,8 @@ fi
 # Alter the following to reflect the location of this file.
 #
 [ -n "$BASH_COMPLETION" ] || BASH_COMPLETION=/usr/share/bash-completion/bash_completion
-[ -n "$BASH_COMPLETION_DIR" ] || BASH_COMPLETION_DIR=/usr/share/bash-completion/completions
-[ -n "$BASH_COMPLETION_HELPERS_DIR" ] || BASH_COMPLETION_HELPERS_DIR=/usr/share/bash-completion/helpers
 [ -n "$BASH_COMPLETION_COMPAT_DIR" ] || BASH_COMPLETION_COMPAT_DIR=/etc/bash_completion.d
-readonly BASH_COMPLETION BASH_COMPLETION_DIR BASH_COMPLETION_HELPERS_DIR BASH_COMPLETION_COMPAT_DIR
+readonly BASH_COMPLETION BASH_COMPLETION_COMPAT_DIR
 
 # Set a couple of useful vars
 #
@@ -1824,11 +1822,11 @@ if [[ -d $BASH_COMPLETION_COMPAT_DIR && -r $BASH_COMPLETION_COMPAT_DIR && \
             && -f $i && -r $i ]] && . "$i"
     done
 fi
-if [[ $BASH_COMPLETION_DIR != $BASH_COMPLETION_COMPAT_DIR && \
-    -d $BASH_COMPLETION_DIR && -r $BASH_COMPLETION_DIR && \
-    -x $BASH_COMPLETION_DIR ]]; then
-    for i in $(LC_ALL=C command ls "$BASH_COMPLETION_DIR"); do
-        i=$BASH_COMPLETION_DIR/$i
+if [[ "${BASH_COMPLETION%/*}/completions" != $BASH_COMPLETION_COMPAT_DIR && \
+    -d "${BASH_COMPLETION%/*}/completions" && -r "${BASH_COMPLETION%/*}/completions" && \
+    -x "${BASH_COMPLETION%/*}/completions" ]]; then
+    for i in $(LC_ALL=C command ls "${BASH_COMPLETION%/*}/completions"); do
+        i="${BASH_COMPLETION%/*}/completions/$i"
         [[ ${i##*/} != @($_backup_glob|Makefile*) \
             && -f $i && -r $i ]] && . "$i"
     done
diff --git a/completions/perl b/completions/perl
index eb1b4b2..e8334e3 100644
--- a/completions/perl
+++ b/completions/perl
@@ -5,7 +5,7 @@ have perl || return
 _perlmodules()
 {
     COMPREPLY=( $( compgen -P "$prefix" -W \
-        "$( ${1:-perl} $BASH_COMPLETION_HELPERS_DIR/perl modules $cur )" \
+        "$( ${1:-perl} ${BASH_COMPLETION%/*}/helpers/perl modules $cur )" \
         -- "$cur" ) )
     __ltrim_colon_completions "$prefix$cur"
 }
@@ -13,7 +13,7 @@ _perlmodules()
 _perlfunctions()
 {
     COMPREPLY=( $( compgen -P "$prefix" -W \
-        "$( ${1:-perl} $BASH_COMPLETION_HELPERS_DIR/perl functions $cur )" \
+        "$( ${1:-perl} ${BASH_COMPLETION%/*}/helpers/perl functions $cur )" \
         -- "$cur" ) )
 }
 

-- 
bash-completion