summaryrefslogtreecommitdiff
path: root/wrap-for-bin.sh
diff options
context:
space:
mode:
authorBenoit Person <benoit.person@ensimag.fr>2013-07-04 22:38:55 +0200
committerJunio C Hamano <gitster@pobox.com>2013-07-08 08:55:34 -0700
commit8bade1e12e2041a21f50009d8baaa11bcb800e8f (patch)
tree5175830b54d80a79588d2b53f697f6b9c46283e6 /wrap-for-bin.sh
parente19189060fcfb62410ce8e008720dbb6e7fa0d7b (diff)
downloadgit-8bade1e12e2041a21f50009d8baaa11bcb800e8f.tar.gz
wrap-for-bin: make bin-wrappers chainable
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>
Diffstat (limited to 'wrap-for-bin.sh')
-rw-r--r--wrap-for-bin.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/wrap-for-bin.sh b/wrap-for-bin.sh
index 53a8dd0a3f..701d2339b9 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:+:$GITPERLLIB}"
GIT_TEXTDOMAINDIR='@@BUILD_DIR@@/po/build/locale'
PATH='@@BUILD_DIR@@/bin-wrappers:'"$PATH"
export GIT_EXEC_PATH GITPERLLIB PATH GIT_TEXTDOMAINDIR