[gentoo-commits] proj/elt-patches:master commit in: /

[Mike Frysinger]

commit:     c4ea896a322a84876a92bc530ef506c098f40c2c
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  4 10:19:36 2021 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Nov  4 10:19:36 2021 +0000
URL:        https://gitweb.gentoo.org/proj/elt-patches.git/commit/?id=c4ea896a

eltpatch: allow ELT_patchdir to be overridden via env

This will allow for local testing.

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

 eltpatch.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/eltpatch.in b/eltpatch.in
index 887fc6f..7d3980e 100644
--- a/eltpatch.in
+++ b/eltpatch.in
@@ -7,6 +7,8 @@ type -P gfind &>/dev/null && FIND=gfind || FIND=find
 type -P gpatch &>/dev/null && PATCH=gpatch || PATCH=patch
 type -P gsed &>/dev/null && SED=gsed || SED=sed
 
+: "${ELT_patchdir:=@ELT_patchdir@}"
+
 source "@ELT_gentoofuncs@" || exit 1
 
 die() {
@@ -74,7 +76,7 @@ ELT_walk_patches() {
        local ret=1
        local file=$1
        local patch_set=$2
-       local patch_dir="@ELT_patchdir@/${patch_set}"
+       local patch_dir="${ELT_patchdir}/${patch_set}"
        local rem_int_dep=$3
 
        [[ -z ${patch_set} ]] && return 1
@@ -88,7 +90,7 @@ ELT_walk_patches() {
                sed_args+=( -e "s|@REM_INT_DEP@|${rem_int_dep}|g" )
        fi
 
-       pushd "@ELT_patchdir@" >/dev/null || die "pushd to elt-patch dir failed"
+       pushd "${ELT_patchdir}" >/dev/null || die "pushd to elt-patch dir 
failed"
 
        # Go through the patches in reverse order (newer version to older)
        for patch in $(${FIND} "${patch_set}" -maxdepth 1 -type f | LC_ALL=C 
sort -r) ; do