update_depot_tools - Issue 140843004: Fetch Windows tools on Cygwin and use that Python for some scripts

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: update_depot_tools

Issue 140843004: Fetch Windows tools on Cygwin and use that Python for some scripts (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master

Patch Set: revert extra change Created 6 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: update_depot_tools

diff --git a/update_depot_tools b/update_depot_tools

index a146724ff163e94340ba3d4910956a28c4f29a24..f71e7f4fe1ac32ef99b43c9e8e91560698846fce 100755

--- a/update_depot_tools

+++ b/update_depot_tools

@@ -17,6 +17,13 @@ then

base_dir=`cd "$base_dir" && pwd -P`

+# Don't try to use Cygwin tools. Get real win32 tools using the batch script.

+OUTPUT="$(uname | grep 'CYGWIN')"

+CYGWIN=$?

+if [ $CYGWIN = 0 ]; then

+ exec cmd /c "$base_dir/bootstrap/win/win_tools.bat" force

+fi

# Test if this script is running under a MSys install. If it is, we will

# hardcode the paths to SVN and Git where possible.

OUTPUT="$(uname | grep 'MINGW')"

« no previous file with comments | « gclient ('k') | no next file » | no next file with comments »