[gentoo-commits] proj/eselect-php:master commit in: src/

[Michael Orlitzky]

commit:     3c19c8620a6e7aef01496d0d0f72162f1964f3d9
Author:     Stefan Langenmaier <stefan.langenmaier <AT> gmail <DOT> com>
AuthorDate: Wed Feb 12 16:24:53 2020 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Feb 29 00:31:29 2020 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-php.git/commit/?id=3c19c862

respect ROOT env variable

Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>

 src/php.eselect.in.in | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/php.eselect.in.in b/src/php.eselect.in.in
index 290d2ff..a047c62 100644
--- a/src/php.eselect.in.in
+++ b/src/php.eselect.in.in
@@ -113,11 +113,11 @@ sapi_active_link_dir() {
        local sapi="${1}"
 
        case "${sapi}" in
-               apache2) echo "@LIBDIR@/apache2/modules" ;;
-               cli)     echo "@BINDIR@" ;;
-               fpm)     echo "@BINDIR@" ;;
-               cgi)     echo "@BINDIR@" ;;
-               phpdbg)  echo "@BINDIR@" ;;
+               apache2) echo "${ROOT%/}@LIBDIR@/apache2/modules" ;;
+               cli)     echo "${ROOT%/}@BINDIR@" ;;
+               fpm)     echo "${ROOT%/}@BINDIR@" ;;
+               cgi)     echo "${ROOT%/}@BINDIR@" ;;
+               phpdbg)  echo "${ROOT%/}@BINDIR@" ;;
                *)       die "invalid SAPI name: ${sapi}" ;;
        esac
 }
@@ -249,7 +249,7 @@ find_targets() {
        # TODO: when there aren't any phpX.Y directories, this returns
        # "php*.*". This doesn't seem to bother our consumers, but it
        # would probably be more polite to return nothing in that case.
-       cd "@LIBDIR@" && echo php*.*
+       cd "${ROOT%/}@LIBDIR@" && echo php*.*
 }
 
 # List all valid targets for the given SAPI. The list is obtained by
@@ -283,7 +283,7 @@ find_sapi_targets() {
        esac
 
        for target in $(find_targets); do
-               local pattern="@LIBDIR@/${target}/${pattern_suffix}"
+               local pattern="${ROOT%/}@LIBDIR@/${target}/${pattern_suffix}"
 
                for file in $pattern; do
                        [[ -f "${file}" ]] && echo "${target}"
@@ -338,7 +338,7 @@ get_sapi_active_target() {
 #
 write_mod_php_conf() {
        local target="${1}"
-       local conf_dir="@LOCALSTATEDIR@/lib/eselect-php"
+       local conf_dir="${ROOT%/}@LOCALSTATEDIR@/lib/eselect-php"
        local conf_path="${conf_dir}/mod_php.conf"
 
        @MKDIR_P@ "${conf_dir}" || die "failed to create ${conf_dir}"
@@ -516,6 +516,11 @@ describe_list_options() {
 }
 
 do_list() {
+       if [ "${ROOT%/}" != "" ] ; then
+               local msg
+               write_warning_msg "ROOT only supported in setting the 
configuration"
+               echo
+       fi
        local sapi="${1}"
        check_module "${sapi}"
        list_sapi "${sapi}"
@@ -536,6 +541,11 @@ describe_show_options() {
 }
 
 do_show() {
+       if [ "${ROOT%/}" != "" ] ; then
+               local msg
+               write_warning_msg "ROOT only supported in setting the 
configuration"
+               echo
+       fi
        local sapi="${1}"
        check_module "${sapi}"
        get_sapi_active_target "${sapi}"