diff options
| author |   Bo Ørsted Andresen <zlin@gentoo.org> | 2008-06-15 23:22:32 +0000 |
|---|---|---|
| committer | Bo Ørsted Andresen <zlin@gentoo.org> | 2008-06-15 23:22:32 +0000 |
| commit | 4844db2e220ec2c3026861d3f6229f17b72ed090 (patch) | |
| tree | ce844dfeac4c6c90ae566b1612b6b125b3707e3a /app-shells | |
| parent | updated older versions for bug #226427 to use eautoreconf (diff) | |
| download | gentoo-2-4844db2e220ec2c3026861d3f6229f17b72ed090.tar.gz gentoo-2-4844db2e220ec2c3026861d3f6229f17b72ed090.tar.bz2 gentoo-2-4844db2e220ec2c3026861d3f6229f17b72ed090.zip | |
Get rid of 'bash: BASH_COMPLETION: readonly variable' message.
(Portage version: 2.1.5.5)
Diffstat (limited to 'app-shells')
| -rw-r--r-- | app-shells/bash-completion/ChangeLog | 9 | ||||
| -rw-r--r-- | app-shells/bash-completion/bash-completion-20060301-r3.ebuild (renamed from app-shells/bash-completion/bash-completion-20060301-r2.ebuild) | 8 | ||||
| -rw-r--r-- | app-shells/bash-completion/files/bash-completion.sh | 6 |
3 files changed, 16 insertions, 7 deletions
diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog index 41476da85569..439f5def0630 100644 --- a/app-shells/bash-completion/ChangeLog +++ b/app-shells/bash-completion/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-shells/bash-completion # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.141 2008/01/12 18:35:56 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.142 2008/06/15 23:22:31 zlin Exp $ + +*bash-completion-20060301-r3 (15 Jun 2008) + + 15 Jun 2008; Bo Ørsted Andresen <zlin@gentoo.org> + files/bash-completion.sh, -bash-completion-20060301-r2.ebuild, + +bash-completion-20060301-r3.ebuild: + Get rid of 'bash: BASH_COMPLETION: readonly variable' message. 12 Jan 2008; Vlastimil Babka <caster@gentoo.org> bash-completion-20050121-r10.ebuild, bash-completion-20050721.ebuild, diff --git a/app-shells/bash-completion/bash-completion-20060301-r2.ebuild b/app-shells/bash-completion/bash-completion-20060301-r3.ebuild index f31c21f62df6..09440c1fca21 100644 --- a/app-shells/bash-completion/bash-completion-20060301-r2.ebuild +++ b/app-shells/bash-completion/bash-completion-20060301-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20060301-r2.ebuild,v 1.3 2008/01/12 18:35:56 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20060301-r3.ebuild,v 1.1 2008/06/15 23:22:31 zlin Exp $ inherit eutils @@ -25,7 +25,7 @@ S="${WORKDIR}/${PN/-/_}" src_unpack() { unpack ${A} - cd ${S} + cd "${S}" EPATCH_SUFFIX="diff" epatch ${FILESDIR}/20050721 EPATCH_SUFFIX="diff" epatch ${FILESDIR}/${PV} } @@ -45,7 +45,7 @@ src_install() { bash_completion || die "failed to split bash_completion" exeinto /etc/profile.d - doexe ${FILESDIR}/bash-completion.sh || die "failed to install profile.d" + doexe "${FILESDIR}"/bash-completion.sh || die "failed to install profile.d" # dev-util/subversion provides an extremely superior completion rm contrib/subversion @@ -61,7 +61,7 @@ pkg_preinst() { if [[ -f ${ROOT}/etc/profile.d/bash-completion && \ ! -f ${ROOT}/etc/profile.d/bash-completion.sh ]] then - mv ${ROOT}/etc/profile.d/bash-completion{,.sh} + mv "${ROOT}"/etc/profile.d/bash-completion{,.sh} fi } diff --git a/app-shells/bash-completion/files/bash-completion.sh b/app-shells/bash-completion/files/bash-completion.sh index fb99daee0b98..aca4fac00e95 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-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.sh,v 1.2 2006/11/22 14:54:21 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/files/bash-completion.sh,v 1.3 2008/06/15 23:22:32 zlin Exp $ # # START bash completion -- do not remove this line @@ -20,7 +20,9 @@ then # Some modules, including base, depend on the definitions # in .pre. See the ebuild for how this is created. if ! $loaded_pre; then - BASH_COMPLETION=/usr/share/bash-completion/base + if [[ ${BASH_COMPLETION-unset} == unset ]]; then + BASH_COMPLETION=/usr/share/bash-completion/base + fi source /usr/share/bash-completion/.pre loaded_pre=true fi |