Re: [PATCH v7 2/7] wrap-for-bin: Make bin-wrappers chainable

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 2, 2013, 23:01 UTC
Message-ID: <7vk3l8in2c.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1372804789-12732-3-git-send-email-benoit.person@ensimag.fr>

benoit.person@ensimag.fr writes:

Show 26 quoted lines

> From: Benoit Person <benoit.person@ensimag.fr>
>
> For now, bin-wrappers (based on wrap-for-bin.sh) redefine some
> environnement variables (like $GITPERLLIB). If we want to chain to
> those scripts and define one of those variables before, our changes
> will be overwritten.
>
> This patch simply makes the bin-wrappers prepend their modifications
> rather than redefine the vars.
>
> Signed-off-by: Benoit Person <benoit.person@ensimag.fr>
> Signed-off-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
> ---
>  wrap-for-bin.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/wrap-for-bin.sh b/wrap-for-bin.sh
> index 53a8dd0..dbebe49 100644
> --- a/wrap-for-bin.sh
> +++ b/wrap-for-bin.sh
> @@ -14,7 +14,7 @@ else
>  	GIT_TEMPLATE_DIR='@@BUILD_DIR@@/templates/blt'
>  	export GIT_TEMPLATE_DIR
>  fi
> -GITPERLLIB='@@BUILD_DIR@@/perl/blib/lib'
> +GITPERLLIB='@@BUILD_DIR@@/perl/blib/lib:'"$GITPERLLIB"

Do we want to add that ':' unconditionally? Could GITPERLLIB be empty?

>  GIT_TEXTDOMAINDIR='@@BUILD_DIR@@/po/build/locale'
>  PATH='@@BUILD_DIR@@/bin-wrappers:'"$PATH"
>  export GIT_EXEC_PATH GITPERLLIB PATH GIT_TEXTDOMAINDIR