Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH bash-completion-r1] Introduce get_bashcompdir() to obtain bash-completion dir.
Date: Sat, 27 Apr 2013 05:45:17
Message-Id: 1367041504-988-1-git-send-email-mgorny@gentoo.org
1 Some ebuilds need to explicitly override bash-completion directory in
2 build system due to build systems having default non-matching Gentoo (or
3 rather Gentoo having bash-completion dir not matching anything else).
4
5 It's better to have a function to obtain that directory rather than for
6 ebuilds to hardcode it.
7 ---
8 gx86/eclass/bash-completion-r1.eclass | 23 +++++++++++++++++++++--
9 1 file changed, 21 insertions(+), 2 deletions(-)
10
11 diff --git a/gx86/eclass/bash-completion-r1.eclass b/gx86/eclass/bash-completion-r1.eclass
12 index 8af46ee..5d23931 100644
13 --- a/gx86/eclass/bash-completion-r1.eclass
14 +++ b/gx86/eclass/bash-completion-r1.eclass
15 @@ -23,6 +23,25 @@ case ${EAPI:-0} in
16 *) die "EAPI ${EAPI} unsupported (yet)."
17 esac
18
19 +# @FUNCTION: _bash-completion-r1_get_bashcompdir
20 +# @INTERNAL
21 +# @DESCRIPTION:
22 +# Get unprefixed bash-completion directory.
23 +_bash-completion-r1_get_bashcompdir() {
24 + debug-print-function ${FUNCNAME} "${@}"
25 +
26 + echo /usr/share/bash-completion
27 +}
28 +
29 +# @FUNCTION: get_bashcompdir
30 +# @DESCRIPTION:
31 +# Get the bash-completion directory.
32 +get_bashcompdir() {
33 + debug-print-function ${FUNCNAME} "${@}"
34 +
35 + echo "${EPREFIX}$(_bash-completion-r1_get_bashcompdir)"
36 +}
37 +
38 # @FUNCTION: dobashcomp
39 # @USAGE: file [...]
40 # @DESCRIPTION:
41 @@ -32,7 +51,7 @@ dobashcomp() {
42 debug-print-function ${FUNCNAME} "${@}"
43
44 (
45 - insinto /usr/share/bash-completion
46 + insinto "$(_bash-completion-r1_get_bashcompdir)"
47 doins "${@}"
48 )
49 }
50 @@ -46,7 +65,7 @@ newbashcomp() {
51 debug-print-function ${FUNCNAME} "${@}"
52
53 (
54 - insinto /usr/share/bash-completion
55 + insinto "$(_bash-completion-r1_get_bashcompdir)"
56 newins "${@}"
57 )
58 }
59 --
60 1.8.2.1

Replies