• [gentoo-dev] [PATCH 4/4] postgres.eclass: stop using which(1)

    From Sam James@21:1/5 to All on Mon Dec 5 12:00:01 2022
    It's non-portable and we're looking to remove it from @system.

    Bug: https://bugs.gentoo.org/646588
    Signed-off-by: Sam James <sam@gentoo.org>
    ---
    eclass/postgres.eclass | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/eclass/postgres.eclass b/eclass/postgres.eclass
    index 3ae1c49adc68..8e204e2ade8c 100644
    --- a/eclass/postgres.eclass
    +++ b/eclass/postgres.eclass
    @@ -106,7 +106,7 @@ postgres_check_slot() {
    fi

    # Don't die because we can't run postgresql-config during pretend.
    - [[ "$EBUILD_PHASE" = "pretend" && -z "$(which postgresql-config 2> /dev/null)" ]] \
    + [[ "$EBUILD_PHASE" = "pretend" && -z "$(type -P postgresql-config 2> /dev/null)" ]] \
    && return 0

    if has $(postgresql-config show 2> /dev/null) "${POSTGRES_COMPAT[@]}"; then
    @@ -148,7 +148,7 @@ postgres_pkg_setup() {
    fi

    export PG_SLOT=${best_slot}
    - export PG_CONFIG=$(which pg_config${best_slot//./})
    + export PG_CONFIG=$(type -P pg_config${best_slot//./})

    local pg_pkg_config_path="$(${PG_CONFIG} --libdir)/pkgconfig"
    if [[ -n "${PKG_CONFIG_PATH}" ]]; then
    --
    2.38.1

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gatew