commit 2e149f2651586221651ee62e8e131a0dd905b661
author Dirk Pranke <dpranke@google.com> Wed Mar 03 01:33:44 2021 +0000
committer LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Mar 03 01:33:44 2021 +0000
tree 3824b387c7fd41878e7ff94c663e36bdcca8f24d
parent bf0766c3a8f98f99239d4f07a5e752fcc0653b4a

Fix python2 wrapper for msys.

The python_bin_reldir.txt path to find the python2 binary will
contain backslashes instead of forward slashes on Windows, so
this tweaks the wrapper in //python2-bin/python2 to handle that
and start working under msys.

Bug: 1168365
Change-Id: If0876054f0a73c9a53a1eb23ea03c60c1e756c29
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2729410
Commit-Queue: Dirk Pranke <dpranke@google.com>
Reviewed-by: Josip Sokcevic <sokcevic@google.com>

python2-bin/python2

diff --git a/python2-bin/python2 b/python2-bin/python2
index 8952755..a5a27f2 100755
--- a/python2-bin/python2
+++ b/python2-bin/python2
@@ -2,6 +2,13 @@
 
 DEPOT_TOOLS=$(dirname "$0")/..
 
-PYTHON_BIN_DIR="$DEPOT_TOOLS/$(cat $DEPOT_TOOLS/python_bin_reldir.txt | xargs echo)"
+if [ "$OSTYPE" = "msys" ]
+then
+  # msys is `git bash` on windows, so python_bin_reldir contains backslashes;
+  # this converts them to the forward slashes a unix environment expects.
+  PYTHON_BIN_DIR="$DEPOT_TOOLS/$(sed -e 's-\\-/-g' $DEPOT_TOOLS/python_bin_reldir.txt)"
+else
+  PYTHON_BIN_DIR="$DEPOT_TOOLS/$(cat $DEPOT_TOOLS/python_bin_reldir.txt)"
+fi
 PATH="$PYTHON_BIN_DIR":"$PATH"
 "$PYTHON_BIN_DIR/python" "$@"