diff options
Diffstat (limited to 'app-shells/bash-completion/files/bash-completion.sh')
| -rw-r--r-- | app-shells/bash-completion/files/bash-completion.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app-shells/bash-completion/files/bash-completion.sh b/app-shells/bash-completion/files/bash-completion.sh index 2ef091fc9cb3..7f8896921b43 100644 --- a/app-shells/bash-completion/files/bash-completion.sh +++ b/app-shells/bash-completion/files/bash-completion.sh @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/files/bash-completion.sh,v 1.5 2009/10/16 01:43:15 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/files/bash-completion.sh,v 1.6 2009/10/16 03:01:10 darkside Exp $ # Check for interactive bash and that we haven't already been sourced. [ -z "$BASH_VERSION" -o -z "$PS1" -o -n "$BASH_COMPLETION" ] && return @@ -21,9 +21,9 @@ if [ $bmajor -eq 2 -a $bminor '>' 04 ] || [ $bmajor -gt 2 ]; then # in .pre. See the ebuild for how this is created. if ! $loaded_pre; then if [[ ${BASH_COMPLETION-unset} == unset ]]; then - BASH_COMPLETION=/usr/share/bash-completion/base + BASH_COMPLETION="@GENTOO_PORTAGE_EPREFIX@"/usr/share/bash-completion/base fi - source /usr/share/bash-completion/.pre + source "@GENTOO_PORTAGE_EPREFIX@"/usr/share/bash-completion/.pre loaded_pre=true fi @@ -42,8 +42,9 @@ if [ $bmajor -eq 2 -a $bminor '>' 04 ] || [ $bmajor -gt 2 ]; then # 4. Load user completion file last, overrides modules at user discretion # This order is subject to change once upstream decides on something. _load_completions \ - /etc/bash_completion.d/base \ - /etc/bash_completion.d/* \ + "@GENTOO_PORTAGE_EPREFIX@"/etc/bash_completion.d/base \ + ~/.bash_completion.d/base \ + "@GENTOO_PORTAGE_EPREFIX@"/etc/bash_completion.d/* \ ~/.bash_completion.d/* \ ~/.bash_completion fi |