summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-shells/bash-completion/files/bash-completion')
-rw-r--r--app-shells/bash-completion/files/bash-completion15
1 files changed, 4 insertions, 11 deletions
diff --git a/app-shells/bash-completion/files/bash-completion b/app-shells/bash-completion/files/bash-completion
index 048d91e1eb41..bd3c9a1d91b4 100644
--- a/app-shells/bash-completion/files/bash-completion
+++ b/app-shells/bash-completion/files/bash-completion
@@ -1,22 +1,15 @@
# 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.4 2004/07/28 23:28:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/files/bash-completion,v 1.5 2004/07/29 02:48:19 joker Exp $
#
# START bash completion -- do not remove this line
bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
-dosource=0
# interactive shell
if [ "$PS1" ] && [ -f /etc/bash_completion ] ; then
- if [ $bmajor -eq 2 ] && [ $bminor '>' 04 ] ; then
- dosource=1
+ if [ $bmajor -eq 2 -a $bminor '>' 04 ] || [ $bmajor -ge 3 ]; then
+ # Source completion code
+ . /etc/bash_completion
fi
- if [ $bmajor -ge 3 ] ; then
- dosource=1
- fi
-fi
-if [ ${dosource} -eq 1 ] ; then
- # Source completion code
- . /etc/bash_completion
fi
unset bash bmajor bminor
# END bash completion -- do not remove this line