* [gentoo-commits] gentoo-x86 commit in eclass: bash-completion.eclass
@ 2008-07-17 9:38 Peter Volkov (pva)
0 siblings, 0 replies; 10+ messages in thread
From: Peter Volkov (pva) @ 2008-07-17 9:38 UTC (permalink / raw
To: gentoo-commits
pva 08/07/17 09:38:08
Modified: bash-completion.eclass
Log:
Make eclass ready for eclass-manpages, bug #210645, thank mren for all work.
Revision Changes Path
1.17 eclass/bash-completion.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/bash-completion.eclass?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/bash-completion.eclass?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/bash-completion.eclass?r1=1.16&r2=1.17
Index: bash-completion.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- bash-completion.eclass 31 Jul 2005 12:38:22 -0000 1.16
+++ bash-completion.eclass 17 Jul 2008 09:38:08 -0000 1.17
@@ -1,14 +1,21 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v 1.16 2005/07/31 12:38:22 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v 1.17 2008/07/17 09:38:08 pva Exp $
+
+# @ECLASS: bash-completion.eclass
+# @MAINTAINER:
+# shell-tools@gentoo.org.
#
+# Original author: Aaron Walker <ka0ttic@gentoo.org>
+# @BLURB: An Interface for installing contributed bash-completion scripts
+# @DESCRIPTION:
# Simple eclass that provides an interface for installing
# contributed (ie not included in bash-completion proper)
# bash-completion scripts.
-#
-# Author: Aaron Walker <ka0ttic@gentoo.org>
-#
-# Please assign any bug reports to shell-tools@gentoo.org.
+
+# @ECLASS-VARIABLE: BASH_COMPLETION_NAME
+# @DESCRIPTION:
+# Install the completion script with this name (see also dobashcompletion)
EXPORT_FUNCTIONS pkg_postinst
@@ -23,15 +30,16 @@
)
)"
-# dobashcompletion <file> <new file>
-# First arg, <file>, is required and is the location of the bash-completion
+# @FUNCTION: dobashcompletion
+# @USAGE: < file > [ new_file ]
+# @DESCRIPTION:
+# First arg, <file>, is required and is the location of the bash-completion
# script to install. If the variable BASH_COMPLETION_NAME is set in the
# ebuild, dobashcompletion will install <file> as
# /usr/share/bash-completion/$BASH_COMPLETION_NAME. If it is not set,
-# dobashcompletion will check if a second arg ($2) was passed, installing as
+# dobashcompletion will check if a second arg [new_file] was passed, installing as
# the specified name. Failing both these checks, dobashcompletion will
# install the file as /usr/share/bash-completion/${PN}.
-
dobashcompletion() {
[[ -z "$1" ]] && die "usage: dobashcompletion <file> <new file>"
[[ -z "${BASH_COMPLETION_NAME}" ]] && BASH_COMPLETION_NAME="${2:-${PN}}"
@@ -42,6 +50,9 @@
fi
}
+# @FUNCTION: bash-completion_pkg_postinst
+# @DESCRIPTION:
+# The bash-completion pkg_postinst function, which is exported
bash-completion_pkg_postinst() {
if useq bash-completion ; then
echo
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: bash-completion.eclass
@ 2009-02-20 6:16 Jeremy Olexa (darkside)
0 siblings, 0 replies; 10+ messages in thread
From: Jeremy Olexa (darkside) @ 2009-02-20 6:16 UTC (permalink / raw
To: gentoo-commits
darkside 09/02/20 06:16:15
Modified: bash-completion.eclass
Log:
remove bash-completion-config support from eclass, as discussed on gentoo-dev ml. see related bug 253878
Revision Changes Path
1.18 eclass/bash-completion.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/bash-completion.eclass?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/bash-completion.eclass?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/bash-completion.eclass?r1=1.17&r2=1.18
Index: bash-completion.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- bash-completion.eclass 17 Jul 2008 09:38:08 -0000 1.17
+++ bash-completion.eclass 20 Feb 2009 06:16:15 -0000 1.18
@@ -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/eclass/bash-completion.eclass,v 1.17 2008/07/17 09:38:08 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v 1.18 2009/02/20 06:16:15 darkside Exp $
# @ECLASS: bash-completion.eclass
# @MAINTAINER:
@@ -21,14 +21,7 @@
IUSE="bash-completion"
-# bash-completion-config is deprecated in favor of eselect,
-# however, eselect currently lacks stable keywords.
-RDEPEND="bash-completion?
- ( || (
- app-admin/eselect
- app-shells/bash-completion-config
- )
- )"
+RDEPEND="bash-completion? ( app-admin/eselect )"
# @FUNCTION: dobashcompletion
# @USAGE: < file > [ new_file ]
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: bash-completion.eclass
@ 2009-02-20 6:22 Jeremy Olexa (darkside)
0 siblings, 0 replies; 10+ messages in thread
From: Jeremy Olexa (darkside) @ 2009-02-20 6:22 UTC (permalink / raw
To: gentoo-commits
darkside 09/02/20 06:22:15
Modified: bash-completion.eclass
Log:
remove useless check in postinst to see if eselct is installed. it has to be installed now is USE=bash-completion is set. also s/einfo/elog/
Revision Changes Path
1.19 eclass/bash-completion.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/bash-completion.eclass?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/bash-completion.eclass?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/bash-completion.eclass?r1=1.18&r2=1.19
Index: bash-completion.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- bash-completion.eclass 20 Feb 2009 06:16:15 -0000 1.18
+++ bash-completion.eclass 20 Feb 2009 06:22:15 -0000 1.19
@@ -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/eclass/bash-completion.eclass,v 1.18 2009/02/20 06:16:15 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v 1.19 2009/02/20 06:22:15 darkside Exp $
# @ECLASS: bash-completion.eclass
# @MAINTAINER:
@@ -48,21 +48,16 @@
# The bash-completion pkg_postinst function, which is exported
bash-completion_pkg_postinst() {
if useq bash-completion ; then
- echo
- einfo "To enable command-line completion for ${PN}, run:"
- einfo
- if has_version app-admin/eselect ; then
- einfo " eselect bashcomp enable ${BASH_COMPLETION_NAME:-${PN}}"
- else
- einfo " bash-completion-config --install ${BASH_COMPLETION_NAME:-${PN}}"
- einfo
- einfo "to install locally, or"
- einfo
- einfo " bash-completion-config --global --install ${BASH_COMPLETION_NAME:-${PN}}"
- einfo
- einfo "to install system-wide."
- einfo "Read bash-completion-config(1) for more information."
- fi
- echo
+ elog "To enable command-line completion for ${PN}, run:"
+ elog
+ elog " eselect bashcomp enable ${BASH_COMPLETION_NAME:-${PN}}"
+ elog " bash-completion-config --install ${BASH_COMPLETION_NAME:-${PN}}"
+ elog
+ elog "to install locally, or"
+ elog
+ elog " bash-completion-config --global --install ${BASH_COMPLETION_NAME:-${PN}}"
+ elog
+ elog "to install system-wide."
+ elog "Read bash-completion-config(1) for more information."
fi
}
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: bash-completion.eclass
@ 2009-02-20 6:45 Jeremy Olexa (darkside)
0 siblings, 0 replies; 10+ messages in thread
From: Jeremy Olexa (darkside) @ 2009-02-20 6:45 UTC (permalink / raw
To: gentoo-commits
darkside 09/02/20 06:45:13
Modified: bash-completion.eclass
Log:
opps, removed wrong portion of if/else statement. Thanks to tove for pointing this out
Revision Changes Path
1.20 eclass/bash-completion.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/bash-completion.eclass?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/bash-completion.eclass?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/bash-completion.eclass?r1=1.19&r2=1.20
Index: bash-completion.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- bash-completion.eclass 20 Feb 2009 06:22:15 -0000 1.19
+++ bash-completion.eclass 20 Feb 2009 06:45:12 -0000 1.20
@@ -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/eclass/bash-completion.eclass,v 1.19 2009/02/20 06:22:15 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v 1.20 2009/02/20 06:45:12 darkside Exp $
# @ECLASS: bash-completion.eclass
# @MAINTAINER:
@@ -51,11 +51,10 @@
elog "To enable command-line completion for ${PN}, run:"
elog
elog " eselect bashcomp enable ${BASH_COMPLETION_NAME:-${PN}}"
- elog " bash-completion-config --install ${BASH_COMPLETION_NAME:-${PN}}"
elog
elog "to install locally, or"
elog
- elog " bash-completion-config --global --install ${BASH_COMPLETION_NAME:-${PN}}"
+ elog " eselect bashcomp enable --global ${BASH_COMPLETION_NAME:-${PN}}"
elog
elog "to install system-wide."
elog "Read bash-completion-config(1) for more information."
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: bash-completion.eclass
@ 2009-02-21 20:17 Jeremy Olexa (darkside)
0 siblings, 0 replies; 10+ messages in thread
From: Jeremy Olexa (darkside) @ 2009-02-21 20:17 UTC (permalink / raw
To: gentoo-commits
darkside 09/02/21 20:17:01
Modified: bash-completion.eclass
Log:
Remove erraneous reference to bash-completion-config man page
Revision Changes Path
1.21 eclass/bash-completion.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/bash-completion.eclass?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/bash-completion.eclass?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/bash-completion.eclass?r1=1.20&r2=1.21
Index: bash-completion.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- bash-completion.eclass 20 Feb 2009 06:45:12 -0000 1.20
+++ bash-completion.eclass 21 Feb 2009 20:17:01 -0000 1.21
@@ -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/eclass/bash-completion.eclass,v 1.20 2009/02/20 06:45:12 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v 1.21 2009/02/21 20:17:01 darkside Exp $
# @ECLASS: bash-completion.eclass
# @MAINTAINER:
@@ -57,6 +57,5 @@
elog " eselect bashcomp enable --global ${BASH_COMPLETION_NAME:-${PN}}"
elog
elog "to install system-wide."
- elog "Read bash-completion-config(1) for more information."
fi
}
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: bash-completion.eclass
@ 2009-12-31 15:57 Ulrich Mueller (ulm)
0 siblings, 0 replies; 10+ messages in thread
From: Ulrich Mueller (ulm) @ 2009-12-31 15:57 UTC (permalink / raw
To: gentoo-commits
ulm 09/12/31 15:57:04
Modified: bash-completion.eclass
Log:
Add a test for app-admin/eselect around RDEPEND to avoid circular dependencies.
Clarify elog message.
Revision Changes Path
1.22 eclass/bash-completion.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/bash-completion.eclass?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/bash-completion.eclass?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/bash-completion.eclass?r1=1.21&r2=1.22
Index: bash-completion.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- bash-completion.eclass 21 Feb 2009 20:17:01 -0000 1.21
+++ bash-completion.eclass 31 Dec 2009 15:57:04 -0000 1.22
@@ -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/eclass/bash-completion.eclass,v 1.21 2009/02/21 20:17:01 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v 1.22 2009/12/31 15:57:04 ulm Exp $
# @ECLASS: bash-completion.eclass
# @MAINTAINER:
@@ -21,7 +21,10 @@
IUSE="bash-completion"
-RDEPEND="bash-completion? ( app-admin/eselect )"
+# Allow eclass to be inherited by eselect without a circular dependency
+if [[ ${CATEGORY}/${PN} != app-admin/eselect ]]; then
+ RDEPEND="bash-completion? ( app-admin/eselect )"
+fi
# @FUNCTION: dobashcompletion
# @USAGE: < file > [ new_file ]
@@ -48,7 +51,8 @@
# The bash-completion pkg_postinst function, which is exported
bash-completion_pkg_postinst() {
if useq bash-completion ; then
- elog "To enable command-line completion for ${PN}, run:"
+ elog "In the case that you haven't yet enabled command-line completion"
+ elog "for ${PN}, you can run:"
elog
elog " eselect bashcomp enable ${BASH_COMPLETION_NAME:-${PN}}"
elog
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: bash-completion.eclass
@ 2010-01-02 0:07 Ulrich Mueller (ulm)
0 siblings, 0 replies; 10+ messages in thread
From: Ulrich Mueller (ulm) @ 2010-01-02 0:07 UTC (permalink / raw
To: gentoo-commits
ulm 10/01/02 00:07:47
Modified: bash-completion.eclass
Log:
Add PDEPEND on app-shells/bash-completion, bug 299051.
Revision Changes Path
1.23 eclass/bash-completion.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/bash-completion.eclass?rev=1.23&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/bash-completion.eclass?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/bash-completion.eclass?r1=1.22&r2=1.23
Index: bash-completion.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- bash-completion.eclass 31 Dec 2009 15:57:04 -0000 1.22
+++ bash-completion.eclass 2 Jan 2010 00:07:46 -0000 1.23
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v 1.22 2009/12/31 15:57:04 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v 1.23 2010/01/02 00:07:46 ulm Exp $
# @ECLASS: bash-completion.eclass
# @MAINTAINER:
@@ -25,6 +25,7 @@
if [[ ${CATEGORY}/${PN} != app-admin/eselect ]]; then
RDEPEND="bash-completion? ( app-admin/eselect )"
fi
+PDEPEND="bash-completion? ( app-shells/bash-completion )"
# @FUNCTION: dobashcompletion
# @USAGE: < file > [ new_file ]
@@ -40,7 +41,7 @@
[[ -z "$1" ]] && die "usage: dobashcompletion <file> <new file>"
[[ -z "${BASH_COMPLETION_NAME}" ]] && BASH_COMPLETION_NAME="${2:-${PN}}"
- if useq bash-completion ; then
+ if use bash-completion ; then
insinto /usr/share/bash-completion
newins "$1" "${BASH_COMPLETION_NAME}" || die "Failed to install $1"
fi
@@ -50,7 +51,7 @@
# @DESCRIPTION:
# The bash-completion pkg_postinst function, which is exported
bash-completion_pkg_postinst() {
- if useq bash-completion ; then
+ if use bash-completion ; then
elog "In the case that you haven't yet enabled command-line completion"
elog "for ${PN}, you can run:"
elog
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: bash-completion.eclass
@ 2011-03-31 4:13 Ryan Hill (dirtyepic)
0 siblings, 0 replies; 10+ messages in thread
From: Ryan Hill (dirtyepic) @ 2011-03-31 4:13 UTC (permalink / raw
To: gentoo-commits
dirtyepic 11/03/31 04:13:51
Modified: bash-completion.eclass
Log:
Add support for installing multiple bash-completion files. (bug #356585)
Revision Changes Path
1.25 eclass/bash-completion.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/bash-completion.eclass?rev=1.25&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/bash-completion.eclass?rev=1.25&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/bash-completion.eclass?r1=1.24&r2=1.25
Index: bash-completion.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- bash-completion.eclass 7 Apr 2010 04:20:46 -0000 1.24
+++ bash-completion.eclass 31 Mar 2011 04:13:51 -0000 1.25
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v 1.24 2010/04/07 04:20:46 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v 1.25 2011/03/31 04:13:51 dirtyepic Exp $
# @ECLASS: bash-completion.eclass
# @MAINTAINER:
@@ -17,6 +17,11 @@
# @DESCRIPTION:
# Install the completion script with this name (see also dobashcompletion)
+# @ECLASS-VARIABLE: BASHCOMPFILES
+# @DESCRIPTION:
+# Space delimited list of files to install if dobashcompletion is called without
+# arguments.
+
EXPORT_FUNCTIONS pkg_postinst
IUSE="bash-completion"
@@ -28,22 +33,33 @@
PDEPEND="bash-completion? ( app-shells/bash-completion )"
# @FUNCTION: dobashcompletion
-# @USAGE: < file > [ new_file ]
+# @USAGE: [file] [new_file]
# @DESCRIPTION:
-# First arg, <file>, is required and is the location of the bash-completion
-# script to install. If the variable BASHCOMPLETION_NAME is set in the
-# ebuild, dobashcompletion will install <file> as
-# /usr/share/bash-completion/$BASHCOMPLETION_NAME. If it is not set,
-# dobashcompletion will check if a second arg [new_file] was passed, installing as
-# the specified name. Failing both these checks, dobashcompletion will
-# install the file as /usr/share/bash-completion/${PN}.
+# The first argument is the location of the bash-completion script to install,
+# and is required if BASHCOMPFILES is not set. The second argument is the name
+# the script will be installed as. If BASHCOMPLETION_NAME is set, it overrides
+# the second argument. If no second argument is given and BASHCOMPLETION_NAME
+# is not set, it will default to ${PN}.
dobashcompletion() {
- [[ -z "$1" ]] && die "usage: dobashcompletion <file> <new file>"
- [[ -z "${BASHCOMPLETION_NAME}" ]] && BASHCOMPLETION_NAME="${2:-${PN}}"
+ local f
- if use bash-completion ; then
+ if [[ -z ${1} && -z ${BASHCOMPFILES} ]]; then
+ die "Usage: dobashcompletion [file] [new file]"
+ fi
+
+ if use bash-completion; then
insinto /usr/share/bash-completion
- newins "$1" "${BASHCOMPLETION_NAME}" || die "Failed to install $1"
+ if [[ -n ${1} ]]; then
+ [[ -z ${BASHCOMPLETION_NAME} ]] && BASHCOMPLETION_NAME="${2:-${PN}}"
+ newins "${1}" "${BASHCOMPLETION_NAME}" || die "Failed to install ${1}"
+ else
+ set -- ${BASHCOMPFILES}
+ for f in "$@"; do
+ if [[ -e ${f} ]]; then
+ doins "${f}" || die "Failed to install ${f}"
+ fi
+ done
+ fi
fi
}
@@ -51,16 +67,24 @@
# @DESCRIPTION:
# The bash-completion pkg_postinst function, which is exported
bash-completion_pkg_postinst() {
+ local f
+
if use bash-completion ; then
- elog "In the case that you haven't yet enabled command-line completion"
- elog "for ${PN}, you can run:"
- elog
- elog " eselect bashcomp enable ${BASHCOMPLETION_NAME:-${PN}}"
+ elog "The following bash-completion scripts have been installed:"
elog
- elog "to install locally, or"
+ if [[ -n ${BASHCOMPLETION_NAME} ]]; then
+ elog " ${BASHCOMPLETION_NAME}"
+ else
+ set -- ${BASHCOMPFILES}
+ for f in "$@"; do
+ elog " $(basename ${f})"
+ done
+ fi
elog
- elog " eselect bashcomp enable --global ${BASHCOMPLETION_NAME:-${PN}}"
+ elog "To enable command-line completion on a per-user basis run:"
+ elog " eselect bashcomp enable <script>"
elog
- elog "to install system-wide."
+ elog "To enable command-line completion system-wide run:"
+ elog " eselect bashcomp enable --global <script>"
fi
}
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: bash-completion.eclass
@ 2011-04-19 4:19 Jeremy Olexa (darkside)
0 siblings, 0 replies; 10+ messages in thread
From: Jeremy Olexa (darkside) @ 2011-04-19 4:19 UTC (permalink / raw
To: gentoo-commits
darkside 11/04/19 04:19:47
Modified: bash-completion.eclass
Log:
reduce one line of noise
Revision Changes Path
1.26 eclass/bash-completion.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/bash-completion.eclass?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/bash-completion.eclass?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/bash-completion.eclass?r1=1.25&r2=1.26
Index: bash-completion.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- bash-completion.eclass 31 Mar 2011 04:13:51 -0000 1.25
+++ bash-completion.eclass 19 Apr 2011 04:19:47 -0000 1.26
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v 1.25 2011/03/31 04:13:51 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v 1.26 2011/04/19 04:19:47 darkside Exp $
# @ECLASS: bash-completion.eclass
# @MAINTAINER:
@@ -71,7 +71,6 @@
if use bash-completion ; then
elog "The following bash-completion scripts have been installed:"
- elog
if [[ -n ${BASHCOMPLETION_NAME} ]]; then
elog " ${BASHCOMPLETION_NAME}"
else
^ permalink raw reply [flat|nested] 10+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: bash-completion.eclass
@ 2011-09-08 19:06 Michal Gorny (mgorny)
0 siblings, 0 replies; 10+ messages in thread
From: Michal Gorny (mgorny) @ 2011-09-08 19:06 UTC (permalink / raw
To: gentoo-commits
mgorny 11/09/08 19:06:46
Modified: bash-completion.eclass
Log:
Deprecate in favor of -r1.
Revision Changes Path
1.28 eclass/bash-completion.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/bash-completion.eclass?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/bash-completion.eclass?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/bash-completion.eclass?r1=1.27&r2=1.28
Index: bash-completion.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- bash-completion.eclass 22 Aug 2011 04:46:31 -0000 1.27
+++ bash-completion.eclass 8 Sep 2011 19:06:46 -0000 1.28
@@ -1,6 +1,10 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v 1.27 2011/08/22 04:46:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/bash-completion.eclass,v 1.28 2011/09/08 19:06:46 mgorny Exp $
+
+# @DEPRECATED
+# This eclass has been superseded by bash-completion-r1 eclass.
+# Please modify your ebuilds to use that one instead.
# @ECLASS: bash-completion.eclass
# @MAINTAINER:
@@ -12,6 +16,9 @@
# Simple eclass that provides an interface for installing
# contributed (ie not included in bash-completion proper)
# bash-completion scripts.
+#
+# Note: this eclass has been deprecated in favor of bash-completion-r1. Please
+# use that one instead.
# @ECLASS-VARIABLE: BASHCOMPLETION_NAME
# @DESCRIPTION:
@@ -22,6 +29,8 @@
# Space delimited list of files to install if dobashcompletion is called without
# arguments.
+inherit eutils
+
EXPORT_FUNCTIONS pkg_postinst
IUSE="bash-completion"
@@ -43,6 +52,9 @@
dobashcompletion() {
local f
+ eqawarn "bash-completion.eclass has been deprecated."
+ eqawarn "Please update your ebuilds to use bash-completion-r1 instead."
+
if [[ -z ${1} && -z ${BASHCOMPFILES} ]]; then
die "Usage: dobashcompletion [file] [new file]"
fi
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2011-09-08 19:06 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-17 9:38 [gentoo-commits] gentoo-x86 commit in eclass: bash-completion.eclass Peter Volkov (pva)
-- strict thread matches above, loose matches on Subject: below --
2009-02-20 6:16 Jeremy Olexa (darkside)
2009-02-20 6:22 Jeremy Olexa (darkside)
2009-02-20 6:45 Jeremy Olexa (darkside)
2009-02-21 20:17 Jeremy Olexa (darkside)
2009-12-31 15:57 Ulrich Mueller (ulm)
2010-01-02 0:07 Ulrich Mueller (ulm)
2011-03-31 4:13 Ryan Hill (dirtyepic)
2011-04-19 4:19 Jeremy Olexa (darkside)
2011-09-08 19:06 Michal Gorny (mgorny)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox