| Index: python_runner.sh
|
| diff --git a/python_git_runner.sh b/python_runner.sh
|
| similarity index 60%
|
| rename from python_git_runner.sh
|
| rename to python_runner.sh
|
| index 2dbda0aad50b4b165f7a70f19d53cab1896d1e5e..fc21bd75f47e0efd8a238dc331e4f3c4370856a7 100755
|
| --- a/python_git_runner.sh
|
| +++ b/python_runner.sh
|
| @@ -1,14 +1,14 @@
|
| -# Copyright 2014 The Chromium Authors. All rights reserved.
|
| +# Copyright 2015 The Chromium Authors. All rights reserved.
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
|
|
| ## This file is designed to be sourced from a bash script whose name takes the
|
| -## form 'git-sub-command'. This script will then instead invoke
|
| -## '[depot_tools]/git_sub_command.py' correctly under mingw as well
|
| +## form 'command-name'. This script will then instead invoke
|
| +## '[depot_tools]/command_name.py' correctly under mingw as well
|
| ## as posix-ey systems, passing along all other command line flags.
|
|
|
| ## Example:
|
| -## echo ". python_git_runner.sh" > git-foo-command
|
| +## echo ". python_runner.sh" > git-foo-command
|
| ## ./git-foo-command #=> runs `python git_foo_command.py`
|
|
|
| ## Constants
|
| @@ -19,14 +19,14 @@ PYTHONDONTWRITEBYTECODE=1
|
| #
|
| # SCRIPT defaults to the basename of $0, with dashes replaced with underscores
|
|
|
| -if [[ $OSTYPE = msys ]]
|
| -then
|
| - DEPOT_TOOLS="${0%\\*}"
|
| - BASENAME="${0##*\\}"
|
| -else
|
| - DEPOT_TOOLS="${0%/*}"
|
| - BASENAME="${0##*/}"
|
| +DEPOT_TOOLS="${0%/*}"
|
| +# Sometimes commands will run with no path (e.g. a git command run from within
|
| +# the depot_tools dir itself). In that case, treat it like it was run like:
|
| +# "./command"
|
| +if [[ "$DEPOT_TOOLS" = "$0" ]]; then
|
| + DEPOT_TOOLS="."
|
| fi
|
| +BASENAME="${0##*/}"
|
| SCRIPT="${SCRIPT-${BASENAME//-/_}.py}"
|
|
|
| if [[ -e "$DEPOT_TOOLS/python.bat" && $OSTYPE = msys ]]; then
|
|
|