The following commit has been merged in the master branch:
commit b39ff7e7118c85b76504e3bd3a19ddbc7433c150
Author: David Paleino <[email protected]>
Date: Fri Feb 20 22:58:01 2009 +0100
Revert "Removed BASH_COMPLETION_COMPAT_DIR"
This reverts commit 34b82bbbe8c70167837153d7ab376b0e1dc6c561.
diff --git a/bash_completion b/bash_completion
index 9db1182..27cebb0 100644
--- a/bash_completion
+++ b/bash_completion
@@ -44,7 +44,8 @@ fi
#
[ -n "$BASH_COMPLETION" ] || BASH_COMPLETION=/etc/bash_completion
[ -n "$BASH_COMPLETION_DIR" ] || BASH_COMPLETION_DIR=/etc/bash_completion.d
-readonly BASH_COMPLETION BASH_COMPLETION_DIR
+[ -n "$BASH_COMPLETION_COMPAT_DIR" ] ||
BASH_COMPLETION_COMPAT_DIR=/etc/bash_completion.d
+readonly BASH_COMPLETION BASH_COMPLETION_DIR BASH_COMPLETION_COMPAT_DIR
# Set a couple of useful vars
#
@@ -9320,7 +9321,15 @@ fi
unset list
# source completion directory definitions
+if [ -d $BASH_COMPLETION_COMPAT_DIR -a -r $BASH_COMPLETION_COMPAT_DIR -a \
+ -x $BASH_COMPLETION_COMPAT_DIR ]; then
+ for i in $BASH_COMPLETION_COMPAT_DIR/*; do
+ [[ ${i##*/} !=
@(*~|*.bak|*.swp|\#*\#|*.dpkg*|*.rpm@(orig|new|save)) ]] &&
+ [ \( -f $i -o -h $i \) -a -r $i ] && . $i
+ done
+fi
if [ -d $BASH_COMPLETION_DIR -a -r $BASH_COMPLETION_DIR -a \
+ $BASH_COMPLETION_DIR != $BASH_COMPLETION_COMPAT_DIR -a \
-x $BASH_COMPLETION_DIR ]; then
for i in $BASH_COMPLETION_DIR/*; do
[[ ${i##*/} !=
@(*~|*.bak|*.swp|\#*\#|*.dpkg*|*.rpm@(orig|new|save)) ]] &&
--
bash-completion
_______________________________________________
Bash-completion-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/bash-completion-commits
