git-cl: Run using vpython
Bug: 1002153
Change-Id: I02ffa574f072575c4b6662a7f32678428ed3f85d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1845498
Reviewed-by: Anthony Polito <apolito@google.com>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
diff --git a/python_runner.sh b/python_runner.sh
index 2834d14..51a5445 100755
--- a/python_runner.sh
+++ b/python_runner.sh
@@ -44,12 +44,16 @@
SCRIPT="${SCRIPT-${BASENAME//-/_}.py}"
+# Ensure that "depot_tools" is somewhere in PATH so this tool can be used
+# standalone, but allow other PATH manipulations to take priority.
+PATH=$PATH:$DEPOT_TOOLS
+
if [[ $PYTHON_DIRECT = 1 ]]; then
python.exe "$DEPOT_TOOLS\\$SCRIPT" "$@"
else
if [[ -e "$DEPOT_TOOLS/python.bat" && $OSTYPE = msys ]]; then
- cmd.exe //c "$DEPOT_TOOLS\\python.bat" "$DEPOT_TOOLS\\$SCRIPT" "$@"
+ cmd.exe //c "$DEPOT_TOOLS\\vpython.bat" "$DEPOT_TOOLS\\$SCRIPT" "$@"
else
- exec "$DEPOT_TOOLS/$SCRIPT" "$@"
+ vpython "$DEPOT_TOOLS/$SCRIPT" "$@"
fi
fi