Update pkg_postinst instructions to explicitly state that /etc/profile.d/bsh-completion should be sourced towards the beginning of your ~/.bashrc, or at least before any aliases are set to avoid a) unintentional misuse (bug 98627), or b) clobbering (as bashcomp does set some aliases under certain conditions).

Package-Manager: portage-2.0.51.22-r1

4 files changed, 28 insertions, 16 deletions

diff --git a/app-shells/bash-completion/ChangeLog b/app-shells/bash-completion/ChangeLog
index 31ce6df2925f..931a0db4ec33 100644
--- a/app-shells/bash-completion/ChangeLog
+++ b/app-shells/bash-completion/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-shells/bash-completion
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.127 2005/07/13 13:17:58 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/ChangeLog,v 1.128 2005/07/14 07:34:58 ka0ttic Exp $
+
+  14 Jul 2005; Aaron Walker <ka0ttic@gentoo.org>
+  bash-completion-20050121-r9.ebuild, bash-completion-20050712.ebuild:
+  Update pkg_postinst instructions to explicitly state that
+  /etc/profile.d/bsh-completion should be sourced towards the beginning of
+  your ~/.bashrc, or at least before any aliases are set to avoid a)
+  unintentional misuse (bug 98627), or b) clobbering (as bashcomp does set
+  some aliases under certain conditions).
 
 *bash-completion-20050712 (13 Jul 2005)
 
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index c2014c2d6a24..4112c771bb24 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 50d47f99bf2bb864365907452e36ff51 bash-completion-20050712.ebuild 1903
-MD5 ebcfc3ffedea1fed2a323797c62bb5f5 bash-completion-20050121-r9.ebuild 1868
-MD5 375e20254a1612a19bd9574a00f01e60 ChangeLog 21795
+MD5 d72109805df2defafbbb6e4d81a07f00 bash-completion-20050712.ebuild 2009
+MD5 1a735c13e1224ab9d4841820fa92b4dd bash-completion-20050121-r9.ebuild 2003
+MD5 548f52117335a4edbe9cf155b9685ff8 ChangeLog 22237
 MD5 08ab540760a142dbc2af127d5f71be07 metadata.xml 1019
 MD5 8872557b2357f405c7c702497b2fdf68 files/digest-bash-completion-20050121-r9 76
 MD5 3b7f1d6155d6deff5812264ef6bc4c07 files/bash-completion 724
@@ -24,7 +24,7 @@ MD5 bb517a3e3dea3755291f4629330481f2 files/20050712/04_all_command.diff 492
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC1RTcEZCkKN40op4RAr5sAJ0eAx4biPjpQ4Ymj68ZtVoBHxDAPgCeIc3N
-NjQbrZaxt+48Ex635J0uvvE=
-=Egkc
+iD8DBQFC1hXtEZCkKN40op4RAg3bAKDBkzHaJNkLl1v46JEfMK5xNKbGMQCeN1ry
+xB4X0LE3HsEBoMAYG7v+sYc=
+=hIte
 -----END PGP SIGNATURE-----
diff --git a/app-shells/bash-completion/bash-completion-20050121-r9.ebuild b/app-shells/bash-completion/bash-completion-20050121-r9.ebuild
index 081c69496da9..6155118d658b 100644
--- a/app-shells/bash-completion/bash-completion-20050121-r9.ebuild
+++ b/app-shells/bash-completion/bash-completion-20050121-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20050121-r9.ebuild,v 1.9 2005/07/07 00:22:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20050121-r9.ebuild,v 1.10 2005/07/14 07:34:59 ka0ttic Exp $
 
 inherit eutils
 
@@ -44,12 +44,15 @@ src_install() {
 
 pkg_postinst() {
 	echo
-	einfo "Add the following line to your ~/.bashrc to"
-	einfo "activate completion support in your bash:"
-	einfo "[ -f /etc/profile.d/bash-completion ] && . /etc/profile.d/bash-completion"
+	einfo "Add the following to your ~/.bashrc to enable completion support."
+	einfo "NOTE: to avoid things like Gentoo bug #98627, you should set aliases"
+	einfo "after sourcing /etc/profile.d/bash-completion."
 	einfo
-	einfo "Additional complete functions can be enabled by symlinking them from"
-	einfo "/usr/share/bash-completion to /etc/bash_completion.d"
+	einfo "[[ -f /etc/profile.d/bash-completion ]] && \\ "
+	einfo "    source /etc/profile.d/bash-completion"
+	einfo
+	einfo "Additional completion functions can be enabled by installing"
+	einfo "app-admin/eselect and using the included bashcomp module."
 	echo
 
 	if has_version 'app-shells/zsh' ; then
diff --git a/app-shells/bash-completion/bash-completion-20050712.ebuild b/app-shells/bash-completion/bash-completion-20050712.ebuild
index 6ba334c050fc..4c919d76663f 100644
--- a/app-shells/bash-completion/bash-completion-20050712.ebuild
+++ b/app-shells/bash-completion/bash-completion-20050712.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20050712.ebuild,v 1.1 2005/07/13 13:17:58 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-20050712.ebuild,v 1.2 2005/07/14 07:34:59 ka0ttic Exp $
 
 inherit eutils
 
@@ -44,8 +44,9 @@ src_install() {
 
 pkg_postinst() {
 	echo
-	einfo "Add the following to the beginning of your ~/.bashrc"
-	einfo "to activate completion support:"
+	einfo "Add the following to your ~/.bashrc to enable completion support."
+	einfo "NOTE: to avoid things like Gentoo bug #98627, you should set aliases"
+	einfo "after sourcing /etc/profile.d/bash-completion."
 	einfo
 	einfo "[[ -f /etc/profile.d/bash-completion ]] && \\ "
 	einfo "    source /etc/profile.d/bash-completion"