Commit bffd63b2 authored by Robert Iannucci's avatar Robert Iannucci Committed by LUCI CQ

[cipd] Take cipd.ps1 out of %PATH%.

Having it in %PATH% means that powershell users will accidentally
run 'cipd.ps1' when they should be running 'cipd.bat'; This would
cause them to get requests for input parameters (like the backend URL)
which they have no idea how to supply.

R=agable@chromium.org, nodir@chromium.org, vadimsh@google.com

Bug: 1073529
Change-Id: I62a3bd9e00229a2047293dba1ba480d28f77bf63
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2161645Reviewed-by: 's avatarEdward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
Auto-Submit: Robbie Iannucci <iannucci@chromium.org>
parent 4a39f37e
......@@ -61,7 +61,7 @@ set BOOTSTRAP_PATH=%BOOTSTRAP_ROOT_DIR%\%BOOTSTRAP_NAME%
set BOOTSTRAP_EXTRA_ARGS=--bootstrap-name "%BOOTSTRAP_NAME%"
:: Install our CIPD packages. The CIPD client self-bootstraps.
:: See "//cipd.bat" and "//cipd.ps1" for more information.
:: See "//cipd.bat" and "//.cipd_impl.ps1" for more information.
set CIPD_EXE=%BOOTSTRAP_ROOT_DIR%\cipd.bat
call "%CIPD_EXE%" ensure -log-level warning -ensure-file "%~dp0%CIPD_MANIFEST%" -root "%BOOTSTRAP_PATH%"
if errorlevel 1 goto :END
......
......@@ -46,9 +46,9 @@ exit /b %EXPORT_ERRORLEVEL%
:: and unzipping the depot_tools.zip distribution, we clear the Zone.Identifier
:: alternate data stream. This is equivalent to clicking the "Unblock" button
:: in the file's properties dialog.
echo.>%~dp0cipd.ps1:Zone.Identifier
echo.>%~dp0.cipd_impl.ps1:Zone.Identifier
powershell -NoProfile -ExecutionPolicy RemoteSigned ^
-Command "%~dp0cipd.ps1" ^
-Command "%~dp0.cipd_impl.ps1" ^
-CipdBinary "%CIPD_BINARY%" ^
-BackendURL "%CIPD_BACKEND%" ^
-VersionFile "%VERSION_FILE%" ^
......
......@@ -58,9 +58,9 @@ class CipdBootstrapTest(unittest.TestCase):
cipd_version: if not None, a value to put into cipd_client_version file.
"""
names = (
'.cipd_impl.ps1',
'cipd',
'cipd.bat',
'cipd.ps1',
'cipd_client_version',
'cipd_client_version.digests',
)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment