1 |
commit: 6e7ac37bdc8927378fd9e1f3221119913064e99b |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Nov 2 01:01:52 2018 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Nov 2 01:01:52 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e7ac37b |
7 |
|
8 |
eclass: php-pear-r2 - Fix up EROOT to be valid for both EAPI |
9 |
|
10 |
Thanks to [Arfrever] for noticing |
11 |
|
12 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
13 |
|
14 |
eclass/php-pear-r2.eclass | 16 ++++++++-------- |
15 |
1 file changed, 8 insertions(+), 8 deletions(-) |
16 |
|
17 |
diff --git a/eclass/php-pear-r2.eclass b/eclass/php-pear-r2.eclass |
18 |
index 26006cbb5f2..e4197522b16 100644 |
19 |
--- a/eclass/php-pear-r2.eclass |
20 |
+++ b/eclass/php-pear-r2.eclass |
21 |
@@ -100,20 +100,20 @@ php-pear-r2_src_install() { |
22 |
# Register package with the local PEAR database. |
23 |
php-pear-r2_pkg_postinst() { |
24 |
# Add unknown channels |
25 |
- if [[ -f "${EROOT}usr/share/php/.packagexml/${PEAR_P}-channel.xml" ]] ; then |
26 |
- "${EROOT}usr/bin/peardev" channel-info "${PHP_PEAR_DOMAIN}" &> /dev/null |
27 |
+ if [[ -f "${EROOT%/}/usr/share/php/.packagexml/${PEAR_P}-channel.xml" ]] ; then |
28 |
+ "${EROOT%/}/usr/bin/peardev" channel-info "${PHP_PEAR_DOMAIN}" &> /dev/null |
29 |
if [[ $? -ne 0 ]]; then |
30 |
- "${EROOT}usr/bin/peardev" channel-add \ |
31 |
- "${EROOT}usr/share/php/.packagexml/${PEAR_P}-channel.xml" \ |
32 |
+ "${EROOT%/}/usr/bin/peardev" channel-add \ |
33 |
+ "${EROOT%/}/usr/share/php/.packagexml/${PEAR_P}-channel.xml" \ |
34 |
|| einfo "Ignore any errors about existing channels" |
35 |
fi |
36 |
fi |
37 |
|
38 |
# Register the package from the package{,2}.xml file |
39 |
# It is not critical to complete so only warn on failure |
40 |
- if [[ -f "${EROOT}usr/share/php/.packagexml/${PEAR_P}.xml" ]] ; then |
41 |
- "${EROOT}usr/bin/peardev" install -nrO --force \ |
42 |
- "${EROOT}usr/share/php/.packagexml/${PEAR_P}.xml" 2> /dev/null \ |
43 |
+ if [[ -f "${EROOT%/}/usr/share/php/.packagexml/${PEAR_P}.xml" ]] ; then |
44 |
+ "${EROOT%/}/usr/bin/peardev" install -nrO --force \ |
45 |
+ "${EROOT%/}/usr/share/php/.packagexml/${PEAR_P}.xml" 2> /dev/null \ |
46 |
|| ewarn "Failed to insert package into local PEAR database" |
47 |
fi |
48 |
} |
49 |
@@ -123,5 +123,5 @@ php-pear-r2_pkg_postinst() { |
50 |
# Deregister package from the local PEAR database |
51 |
php-pear-r2_pkg_postrm() { |
52 |
# Uninstall known dependency |
53 |
- "${EROOT}usr/bin/peardev" uninstall -nrO "${PHP_PEAR_DOMAIN}/${PHP_PEAR_PKG_NAME}" |
54 |
+ "${EROOT%/}/usr/bin/peardev" uninstall -nrO "${PHP_PEAR_DOMAIN}/${PHP_PEAR_PKG_NAME}" |
55 |
} |