diff options
| author |   Aaron Walker <ka0ttic@gentoo.org> | 2004-11-12 23:44:04 +0000 |
|---|---|---|
| committer | Aaron Walker <ka0ttic@gentoo.org> | 2004-11-12 23:44:04 +0000 |
| commit | 2e676309bdfc3d09e108cc621831bc520a9ad310 (patch) | |
| tree | 2eafbe90e5c244da5120db8b279b160906665999 /app-shells/bash-completion/files | |
| parent | Tricksy patchesess, mispellses thems we does. (Manifest recommit) (diff) | |
| download | gentoo-2-2e676309bdfc3d09e108cc621831bc520a9ad310.tar.gz gentoo-2-2e676309bdfc3d09e108cc621831bc520a9ad310.tar.bz2 gentoo-2-2e676309bdfc3d09e108cc621831bc520a9ad310.zip | |
Clean up profile.d file thanks to Joker.
Diffstat (limited to 'app-shells/bash-completion/files')
| -rw-r--r-- | app-shells/bash-completion/files/bash-completion | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/app-shells/bash-completion/files/bash-completion b/app-shells/bash-completion/files/bash-completion index 3d4699395054..e1e58e1e7a2c 100644 --- a/app-shells/bash-completion/files/bash-completion +++ b/app-shells/bash-completion/files/bash-completion @@ -1,22 +1,19 @@ # Copyright 1999-2004 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,v 1.6 2004/11/09 12:30:13 ka0ttic Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/files/bash-completion,v 1.7 2004/11/12 23:44:04 ka0ttic Exp $ # # START bash completion -- do not remove this line bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.} # interactive shell -if [ "$PS1" ] && [ -f /etc/bash_completion ] ; then +if [ "$PS1" ]; then if [ $bmajor -eq 2 -a $bminor '>' 04 ] || [ $bmajor -ge 3 ]; then - # Source completion code - . /etc/bash_completion + [ -f /etc/bash_completion ] && . /etc/bash_completion + if [ -d ~/.bash_completion.d ] ; then + for file in ~/.bash_completion.d/* ; do + [ -f $file ] && . $file + done + fi fi fi unset bash bmajor bminor - -# per-user completions -if [ "$PS1" ] && [ -d ~/.bash_completion.d ] ; then - for file in ~/.bash_completion.d/* ; do - [ -f $file ] && source $file - done -fi # END bash completion -- do not remove this line |