mirror of
https://github.com/git/git.git
synced 2024-11-09 02:33:11 +01:00
8bade1e12e
For now, bin-wrappers overwrites GITPERLLIB. If we want to chain to those scripts and define GITPERLLIB before, our changes will be discarded. This patch makes the bin-wrappers prepend their modifications to GITPERLLIB rather than redefining it. It also unset GITPERLLIB in the test-suite to prevent broken $GITPERLLIB in the user's configuration from interfering with the testsuite. The codes using GIT_TEMPLATE_DIR and GIT_TEXTDOMAINDIR handle only one path in each of this variable so this new behavior would be useless on those variables. Signed-off-by: Benoit Person <benoit.person@ensimag.fr> Signed-off-by: Matthieu Moy <matthieu.moy@grenoble-inp.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
22 lines
707 B
Bash
22 lines
707 B
Bash
#!/bin/sh
|
|
|
|
# wrap-for-bin.sh: Template for git executable wrapper scripts
|
|
# to run test suite against sandbox, but with only bindir-installed
|
|
# executables in PATH. The Makefile copies this into various
|
|
# files in bin-wrappers, substituting
|
|
# @@BUILD_DIR@@ and @@PROG@@.
|
|
|
|
GIT_EXEC_PATH='@@BUILD_DIR@@'
|
|
if test -n "$NO_SET_GIT_TEMPLATE_DIR"
|
|
then
|
|
unset GIT_TEMPLATE_DIR
|
|
else
|
|
GIT_TEMPLATE_DIR='@@BUILD_DIR@@/templates/blt'
|
|
export GIT_TEMPLATE_DIR
|
|
fi
|
|
GITPERLLIB='@@BUILD_DIR@@/perl/blib/lib'"${GITPERLLIB:+:$GITPERLLIB}"
|
|
GIT_TEXTDOMAINDIR='@@BUILD_DIR@@/po/build/locale'
|
|
PATH='@@BUILD_DIR@@/bin-wrappers:'"$PATH"
|
|
export GIT_EXEC_PATH GITPERLLIB PATH GIT_TEXTDOMAINDIR
|
|
|
|
exec "${GIT_EXEC_PATH}/@@PROG@@" "$@"
|