Revert "Removed BASH_COMPLETION_COMPAT_DIR"

This reverts commit 34b82bbbe8c70167837153d7ab376b0e1dc6c561.
This commit is contained in:
David Paleino 2009-02-20 22:58:01 +01:00
parent 34b82bbbe8
commit b39ff7e711

View File

@ -44,7 +44,8 @@ fi
# #
[ -n "$BASH_COMPLETION" ] || BASH_COMPLETION=/etc/bash_completion [ -n "$BASH_COMPLETION" ] || BASH_COMPLETION=/etc/bash_completion
[ -n "$BASH_COMPLETION_DIR" ] || BASH_COMPLETION_DIR=/etc/bash_completion.d [ -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 # Set a couple of useful vars
# #
@ -9320,7 +9321,15 @@ fi
unset list unset list
# source completion directory definitions # 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 \ if [ -d $BASH_COMPLETION_DIR -a -r $BASH_COMPLETION_DIR -a \
$BASH_COMPLETION_DIR != $BASH_COMPLETION_COMPAT_DIR -a \
-x $BASH_COMPLETION_DIR ]; then -x $BASH_COMPLETION_DIR ]; then
for i in $BASH_COMPLETION_DIR/*; do for i in $BASH_COMPLETION_DIR/*; do
[[ ${i##*/} != @(*~|*.bak|*.swp|\#*\#|*.dpkg*|*.rpm@(orig|new|save)) ]] && [[ ${i##*/} != @(*~|*.bak|*.swp|\#*\#|*.dpkg*|*.rpm@(orig|new|save)) ]] &&