diff --git a/apply_issue.bat b/apply_issue.bat index 30bc306bc..2a035062b 100755 --- a/apply_issue.bat +++ b/apply_issue.bat @@ -4,9 +4,5 @@ :: found in the LICENSE file. setlocal -:: Ensure that "depot_tools" is somewhere in PATH so this tool can be used -:: standalone, but allow other PATH manipulations to take priority. -set PATH=%PATH%;%~dp0 - :: Defer control. -python "%~dp0\apply_issue.py" %* +%~dp0python "%~dp0\apply_issue.py" %* diff --git a/cit.bat b/cit.bat index 82919b936..8f79044aa 100755 --- a/cit.bat +++ b/cit.bat @@ -1,12 +1,8 @@ -@echo off -:: Copyright (c) 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. -setlocal - -:: Ensure that "depot_tools" is somewhere in PATH so this tool can be used -:: standalone, but allow other PATH manipulations to take priority. -set PATH=%PATH%;%~dp0 - -:: Defer control. -python "%~dp0\cit.py" %* +@echo off +:: Copyright (c) 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. +setlocal + +:: Defer control. +%~dp0python "%~dp0\cit.py" %* diff --git a/clang-format.bat b/clang-format.bat index c3bb53bc4..884cd246a 100644 --- a/clang-format.bat +++ b/clang-format.bat @@ -4,9 +4,5 @@ :: found in the LICENSE file. setlocal -:: Ensure that "depot_tools" is somewhere in PATH so this tool can be used -:: standalone, but allow other PATH manipulations to take priority. -set PATH=%PATH%;%~dp0 - :: Defer control. -python "%~dp0\clang_format.py" %* +%~dp0python "%~dp0\clang_format.py" %* diff --git a/clang_format_merge_driver.bat b/clang_format_merge_driver.bat index 8e614b492..6f15dd749 100755 --- a/clang_format_merge_driver.bat +++ b/clang_format_merge_driver.bat @@ -1,12 +1,8 @@ -@echo off -:: Copyright 2016 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. -setlocal - -:: Ensure that "depot_tools" is somewhere in PATH so this tool can be used -:: standalone, but allow other PATH manipulations to take priority. -set PATH=%PATH%;%~dp0 - -:: Defer control. -python "%~dp0\clang_format_merge_driver.py" %* +@echo off +:: Copyright 2016 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. +setlocal + +:: Defer control. +%~dp0python "%~dp0\clang_format_merge_driver.py" %* diff --git a/commit_queue.bat b/commit_queue.bat index 44639a64d..c1babf04c 100755 --- a/commit_queue.bat +++ b/commit_queue.bat @@ -4,9 +4,5 @@ :: found in the LICENSE file. setlocal -:: Ensure that "depot_tools" is somewhere in PATH so this tool can be used -:: standalone, but allow other PATH manipulations to take priority. -set PATH=%PATH%;%~dp0 - :: Defer control. -python "%~dp0\commit_queue.py" %* +%~dp0python "%~dp0\commit_queue.py" %* diff --git a/cpplint.bat b/cpplint.bat index 30faf8bbb..914eecf1a 100644 --- a/cpplint.bat +++ b/cpplint.bat @@ -1,11 +1,4 @@ @echo off -:: Copyright 2016 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. setlocal -:: Ensure that "depot_tools" is somewhere in PATH so this tool can be used -:: standalone, but allow other PATH manipulations to take priority. -set PATH=%PATH%;%~dp0 - call python "%~dp0cpplint.py" %* diff --git a/depot-tools-auth.bat b/depot-tools-auth.bat index 37280b765..4770ed6fb 100644 --- a/depot-tools-auth.bat +++ b/depot-tools-auth.bat @@ -4,9 +4,5 @@ :: found in the LICENSE file. setlocal -:: Ensure that "depot_tools" is somewhere in PATH so this tool can be used -:: standalone, but allow other PATH manipulations to take priority. -set PATH=%PATH%;%~dp0 - :: Defer control. -python "%~dp0\depot-tools-auth.py" %* +%~dp0python "%~dp0\depot-tools-auth.py" %* diff --git a/download_from_google_storage.bat b/download_from_google_storage.bat index f1f2d2161..4c7971b42 100755 --- a/download_from_google_storage.bat +++ b/download_from_google_storage.bat @@ -2,11 +2,6 @@ :: Copyright (c) 2012 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. -setlocal - -:: Ensure that "depot_tools" is somewhere in PATH so this tool can be used -:: standalone, but allow other PATH manipulations to take priority. -set PATH=%PATH%;%~dp0 :: Defer control. -python "%~dp0\download_from_google_storage.py" %* +%~dp0python "%~dp0\download_from_google_storage.py" %* diff --git a/fetch.bat b/fetch.bat index 5f8019a19..d6ea944e2 100755 --- a/fetch.bat +++ b/fetch.bat @@ -7,9 +7,5 @@ setlocal :: Synchronize the root directory before deferring control back to gclient.py. call "%~dp0\update_depot_tools.bat" -:: Ensure that "depot_tools" is somewhere in PATH so this tool can be used -:: standalone, but allow other PATH manipulations to take priority. -set PATH=%PATH%;%~dp0 - :: Defer control. -python "%~dp0\fetch.py" %* +%~dp0python "%~dp0\fetch.py" %* diff --git a/gclient.bat b/gclient.bat index 3d2fe2627..d66ce6a41 100755 --- a/gclient.bat +++ b/gclient.bat @@ -7,9 +7,5 @@ setlocal :: Synchronize the root directory before deferring control back to gclient.py. call "%~dp0update_depot_tools.bat" %* -:: Ensure that "depot_tools" is somewhere in PATH so this tool can be used -:: standalone, but allow other PATH manipulations to take priority. -set PATH=%PATH%;%~dp0 - :: Defer control. -"python" "%~dp0gclient.py" %* +"%~dp0python" "%~dp0gclient.py" %* diff --git a/gn.bat b/gn.bat index 9eb6b56a1..0a42a0766 100644 --- a/gn.bat +++ b/gn.bat @@ -4,9 +4,5 @@ :: found in the LICENSE file. setlocal -:: Ensure that "depot_tools" is somewhere in PATH so this tool can be used -:: standalone, but allow other PATH manipulations to take priority. -set PATH=%PATH%;%~dp0 - :: Defer control. -python "%~dp0\gn.py" %* +%~dp0python "%~dp0\gn.py" %* diff --git a/roll-dep-svn.bat b/roll-dep-svn.bat index 6ff5db78f..b2aec795e 100755 --- a/roll-dep-svn.bat +++ b/roll-dep-svn.bat @@ -1,12 +1,7 @@ -@echo off -:: Copyright (c) 2012 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. -setlocal - -:: Ensure that "depot_tools" is somewhere in PATH so this tool can be used -:: standalone, but allow other PATH manipulations to take priority. -set PATH=%PATH%;%~dp0 - -:: Defer control. -python "%~dp0\roll_dep_svn.py" %* +@echo off +:: Copyright (c) 2012 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. + +:: Defer control. +%~dp0python "%~dp0\roll_dep_svn.py" %* diff --git a/roll-dep.bat b/roll-dep.bat index c49c88dc5..d5166dfa8 100755 --- a/roll-dep.bat +++ b/roll-dep.bat @@ -2,11 +2,6 @@ :: Copyright (c) 2012 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. -setlocal - -:: Ensure that "depot_tools" is somewhere in PATH so this tool can be used -:: standalone, but allow other PATH manipulations to take priority. -set PATH=%PATH%;%~dp0 :: Defer control. -python "%~dp0\roll_dep.py" %* +%~dp0python "%~dp0\roll_dep.py" %*