diff options
author | Brian Gernhardt <brian@gernhardtsoftware.com> | 2010-04-09 11:57:45 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-04-09 20:47:22 -0700 |
commit | f733f6a0c690a3d5e399c438d4dc3f2307418171 (patch) | |
tree | 08757326fc2e80715550957e912102f5832acf53 /git-remote-testgit.py | |
parent | 2cb5a48195362845fce284626f3d6eb62dcad204 (diff) | |
download | git-f733f6a0c690a3d5e399c438d4dc3f2307418171.tar.gz git-f733f6a0c690a3d5e399c438d4dc3f2307418171.tar.xz |
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 <gitster@pobox.com>
Signed-off-by: Brian Gernhardt <brian@gernhardtsoftware.com>
Acked-by: Sverre Rabbelier <srabbelier@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-remote-testgit.py')
-rw-r--r-- | git-remote-testgit.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git-remote-testgit.py b/git-remote-testgit.py index f61624e48..92539222c 100644 --- a/git-remote-testgit.py +++ b/git-remote-testgit.py @@ -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 |