Instead of requiring scripts to start with "import sys",
install the sys.path initialization code immediately
after each script's new shebang line.
This works around portability issues with multi-line sed and
simplifies the work for contributors. There is no longer
the requirement that every script must "import sys" before
importing git-provided modules.
Signed-off-by: David Aguilar <davvid@xxxxxxxxx>
---
Makefile | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 956e781..b763947 100644
--- a/Makefile
+++ b/Makefile
@@ -1608,12 +1608,10 @@ $(patsubst %.py,%,$(SCRIPT_PYTHON)): % : %.py
--no-print-directory prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' \
instlibdir` && \
sed -e '1{' \
- -e ' s|#!.*python|#!$(PYTHON_PATH_SQ)|' \
+ -e ' s|#!.*python|#!$(PYTHON_PATH_SQ)\n@@STARTUP@@|' \
-e '}' \
- -e 's|^import sys.*|&; \\\
- import os; \\\
- sys.path.insert(0, os.getenv("GITPYTHONLIB",\
- "@@INSTLIBDIR@@"));|' \
+ -e 's|@@STARTUP@@|import os, sys; sys.path.insert(0, @@ENV@@)|' \
+ -e 's|@@ENV@@|os.getenv("GITPYTHONLIB", "@@INSTLIBDIR@@")|' \
-e 's|@@INSTLIBDIR@@|'"$$INSTLIBDIR"'|g' \
$@.py >$@+ && \
chmod +x $@+ && \
--
1.7.0.3.313.g87b3c
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html