[Bash-completion-commits] [SCM] bash-completion branch, master, updated. cb7fc2f7c4a4c7c5a665c5bf8b73b40fc5e268a9

[Guillaume Rousse]

The following commit has been merged in the master branch:
commit ff6172097df8fda0f1085528b74f63887c876f91
Author: Guillaume Rousse <Guillaume.Rousse at inria.fr>
Date:   Sun Sep 12 16:38:59 2010 +0200

    symlinks are automatically dereferenced for -f test, so don't use -h test

diff --git a/bash_completion b/bash_completion
index ad45a8d..eabb38d 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1627,7 +1627,7 @@ if [[ -d $BASH_COMPLETION_COMPAT_DIR && -r $BASH_COMPLETION_COMPAT_DIR && \
     for i in $(LC_ALL=C command ls "$BASH_COMPLETION_COMPAT_DIR"); do
         i=$BASH_COMPLETION_COMPAT_DIR/$i
         [[ ${i##*/} != @(*~|*.bak|*.swp|\#*\#|*.dpkg*|*.rpm@(orig|new|save)|Makefile*) \
-            && ( -f $i || -h $i ) && -r $i ]] && . "$i"
+            && -f $i && -r $i ]] && . "$i"
     done
 fi
 if [[ $BASH_COMPLETION_DIR != $BASH_COMPLETION_COMPAT_DIR && \
@@ -1636,7 +1636,7 @@ if [[ $BASH_COMPLETION_DIR != $BASH_COMPLETION_COMPAT_DIR && \
     for i in $(LC_ALL=C command ls "$BASH_COMPLETION_DIR"); do
         i=$BASH_COMPLETION_DIR/$i
         [[ ${i##*/} != @(*~|*.bak|*.swp|\#*\#|*.dpkg*|*.rpm@(orig|new|save)|Makefile*) \
-            && ( -f $i || -h $i ) && -r $i ]] && . "$i"
+            && -f $i && -r $i ]] && . "$i"
     done
 fi
 unset i

-- 
bash-completion