Gentoo Archives: gentoo-commits

From: Michael Orlitzky <mjo@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/eselect-php:master commit in: src/
Date: Fri, 11 Dec 2015 00:40:35
Message-Id: 1449756165.c09a74e0b46e3cd72c5057d23b2ec2038b82a6f0.mjo@gentoo
1 commit: c09a74e0b46e3cd72c5057d23b2ec2038b82a6f0
2 Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 10 14:02:45 2015 +0000
4 Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 10 14:02:45 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=c09a74e0
7
8 Document the find_targets_apache2() and get_active_apache2() functions.
9
10 src/php.eselect.in | 28 ++++++++++++++++++++++++++++
11 1 file changed, 28 insertions(+)
12
13 diff --git a/src/php.eselect.in b/src/php.eselect.in
14 index 5bbb491..e08afbe 100644
15 --- a/src/php.eselect.in
16 +++ b/src/php.eselect.in
17 @@ -82,6 +82,22 @@ find_targets() {
18 echo $dirs
19 }
20
21 +# List all valid apache2 targets. The list is obtained by searching
22 +# for libphp*.so in locations determined by find_targets(). This list
23 +# should therefore be a subset of find_targets().
24 +#
25 +# INPUT:
26 +#
27 +# None.
28 +#
29 +# OUTPUT:
30 +#
31 +# The "display name" of every available apache PHP module, one per line.
32 +# For example,
33 +#
34 +# php5.6
35 +# php7.0
36 +#
37 find_targets_apache2() {
38 local libs target libdir
39 for target in $(find_targets); do
40 @@ -143,6 +159,18 @@ get_active_fpm() {
41 }
42
43
44 +# Find the active (selected) version of the apache2 module. Used to
45 +# decorate the output of the `eselect php list apache2` command.
46 +#
47 +# INPUT:
48 +#
49 +# None.
50 +#
51 +# OUTPUT:
52 +#
53 +# The "display name" of the active apache2 module. For example,
54 +# "php5.6" or "php7.0".
55 +#
56 get_active_apache2() {
57 local libs target ver
58 libs="${EROOT}$(get_active_libdir)/apache2/modules/libphp[57].so"