path: root/
diff options
authorBrian Gernhardt <>2010-04-09 15:57:45 (GMT)
committerJunio C Hamano <>2010-04-10 03:47:22 (GMT)
commitf733f6a0c690a3d5e399c438d4dc3f2307418171 (patch)
tree08757326fc2e80715550957e912102f5832acf53 /
parent2cb5a48195362845fce284626f3d6eb62dcad204 (diff)
Makefile: Simplify handling of python scripts
The sed script intended to add a standard opening to python scripts was non-compatible and overly complex. Simplifying it down to a set of one-liners removes the compatibility issues of newlines. Moving the environment alterations from the Makefile to the python scripts makes also makes the scripts easier to run in-place. Specifically, the new sed script: - Alters the shebang line to use the configured Python. - Alters any os.getenv("GITPYTHONLIB") calls to use @@INSTLIBDIR@@ as the default. This will replace any existing default or add a default if none is provided. - Replaces the @@INSTLIBDIR@@ placeholder with the directory git installs its python libraries to. The last two steps could be combined into a single step, but is left separate in case someone has another need for @@INSTLIBDIR@@ in their script. Suggested-by: Junio C Hamano <> Signed-off-by: Brian Gernhardt <> Acked-by: Sverre Rabbelier <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to '')
1 files changed, 2 insertions, 0 deletions
diff --git a/ b/
index f61624e..9253922 100644
--- a/
+++ b/
@@ -2,6 +2,8 @@
import hashlib
import sys
+import os
+sys.path.insert(0, os.getenv("GITPYTHONLIB","."))
from git_remote_helpers.util import die, debug, warn
from git_remote_helpers.git.repo import GitRepo