[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 1.90-128-g2ad325d

[David Paleino]

The following commit has been merged in the master branch:
commit 2ad325d4afc4ef96aedc7b91c8e75502647c260d
Author: David Paleino <dapal at debian.org>
Date:   Wed Jan 11 21:48:35 2012 +0100

    Revert "Fix completion loading when a symlink is sourced, thanks to Jonathan Nieder"
    
    This reverts commit 318759c8497cfce3704bc1b97c41459a5be08f7b.

diff --git a/bash_completion b/bash_completion
index 509ad88..ef79f0a 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1916,8 +1916,7 @@ _minimal()
 _completion_loader()
 {
     local compdir=./completions
-    local compscript=$(readlink -f $BASH_SOURCE)
-    [[ $compscript == */* ]] && compdir="${compscript%/*}/completions"
+    [[ $BASH_SOURCE == */* ]] && compdir="${BASH_SOURCE%/*}/completions"
 
     # Try basename.
     . "$compdir/${1##*/}" &>/dev/null && return 124
@@ -1938,8 +1937,7 @@ _xfunc()
     shift
     declare -F $1 &>/dev/null || {
         local compdir=./completions
-        local compscript=$(readlink -f $BASH_SOURCE)
-        [[ $compscript == */* ]] && compdir="${compscript%/*}/completions"
+        [[ $BASH_SOURCE == */* ]] && compdir="${BASH_SOURCE%/*}/completions"
         . "$compdir/$srcfile"
     }
     "$@"

-- 
bash-completion