csonto/bash-completion
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get rid of BASH_COMPLETION_DIR and BASH_COMPLETION_HELPERS_DIR

Browse Source
This commit is contained in:
David Paleino 2011-05-02 18:37:49 +02:00
parent bf358666d2
commit 43728af423
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bash_completion
View File

@ -40,10 +40,8 @@ fi
# Alter the following to reflect the location of this file. # Alter the following to reflect the location of this file.
# #
[ -n "$BASH_COMPLETION" ] || BASH_COMPLETION=/usr/share/bash-completion/bash_completion [ -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 [ -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 # 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" && -f $i && -r $i ]] && . "$i"
done done
fi fi
if [[ $BASH_COMPLETION_DIR != $BASH_COMPLETION_COMPAT_DIR && \ if [[ "${BASH_COMPLETION%/*}/completions" != $BASH_COMPLETION_COMPAT_DIR && \
-d $BASH_COMPLETION_DIR && -r $BASH_COMPLETION_DIR && \ -d "${BASH_COMPLETION%/*}/completions" && -r "${BASH_COMPLETION%/*}/completions" && \
-x $BASH_COMPLETION_DIR ]]; then -x "${BASH_COMPLETION%/*}/completions" ]]; then
for i in $(LC_ALL=C command ls "$BASH_COMPLETION_DIR"); do for i in $(LC_ALL=C command ls "${BASH_COMPLETION%/*}/completions"); do
i=$BASH_COMPLETION_DIR/$i i="${BASH_COMPLETION%/*}/completions/$i"
[[ ${i##*/} != @($_backup_glob|Makefile*) \ [[ ${i##*/} != @($_backup_glob|Makefile*) \
&& -f $i && -r $i ]] && . "$i" && -f $i && -r $i ]] && . "$i"
done done

4
completions/perl
View File

@ -5,7 +5,7 @@ have perl || return
_perlmodules() _perlmodules()
{ {
COMPREPLY=( $( compgen -P "$prefix" -W \ COMPREPLY=( $( compgen -P "$prefix" -W \
"$( ${1:-perl} $BASH_COMPLETION_HELPERS_DIR/perl modules $cur )" \ "$( ${1:-perl} ${BASH_COMPLETION%/*}/helpers/perl modules $cur )" \
-- "$cur" ) ) -- "$cur" ) )
__ltrim_colon_completions "$prefix$cur" __ltrim_colon_completions "$prefix$cur"
} }
@ -13,7 +13,7 @@ _perlmodules()
_perlfunctions() _perlfunctions()
{ {
COMPREPLY=( $( compgen -P "$prefix" -W \ COMPREPLY=( $( compgen -P "$prefix" -W \
"$( ${1:-perl} $BASH_COMPLETION_HELPERS_DIR/perl functions $cur )" \ "$( ${1:-perl} ${BASH_COMPLETION%/*}/helpers/perl functions $cur )" \
-- "$cur" ) ) -- "$cur" ) )
} }