From ed9a0ecb4f678dc090bba7d6f247944359c32604 Mon Sep 17 00:00:00 2001 From: "szager@google.com" Date: Tue, 6 Nov 2012 22:25:16 +0000 Subject: [PATCH] Fix dirname logic for msys and not-msys. TBR=maruel@chromium.org Review URL: https://codereview.chromium.org/11364105 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@166284 0039d316-1c4b-4281-b951-d872f2087c98 --- git-cl | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/git-cl b/git-cl index 03efa1aa25..0fc4354d57 100755 --- a/git-cl +++ b/git-cl @@ -6,16 +6,20 @@ # git-cl -- a git-command for integrating reviews on Rietveld # Copyright (C) 2008 Evan Martin -base_dir=$(dirname "$0") - -# Uncomment this line if you never use gclient. -# "$base_dir"/update_depot_tools - # Test if this script is running under a MSys install. If it is, we will # hardcode the path to Python where possible. OUTPUT="$(uname | grep 'MINGW')" MINGW=$? +if [ $MINGW = 0 ]; then + base_dir="${0%\\*}" +else + base_dir=$(dirname "$0") +fi + +# Uncomment this line if you never use gclient. +# "$base_dir"/update_depot_tools + if [ -d "$base_dir/python_bin" -a $MINGW = 0 ]; then PYTHONDONTWRITEBYTECODE=1 exec "$base_dir/python_bin/python.exe" "$base_dir"/git_cl.py "$@" else