mirror of
https://chromium.googlesource.com/chromium/tools/depot_tools.git
synced 2026-01-11 02:31:29 +00:00
Fix .cipd_impl.ps1 failure because of execution policy
The introduction of the `-File` parameter for invoking .cipd_impl.ps1 made its execution dependent on the system's PowerShell ExecutionPolicy, causing failures in restricted environments. This CL solves following problems: 1. Failures when the depot_tools path contains whitespace. 2. Make cipd.bat behave consistently with how it did before introducing '-File' Bug: 428834916 Change-Id: Idf16bfeb5d5188dc4a13ab3200f692d99b3d33af Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/7257554 Reviewed-by: Gavin Mak <gavinmak@google.com> Reviewed-by: Sam Lewis <samclewis@google.com> Commit-Queue: Sam Lewis <samclewis@google.com>
This commit is contained in:
13
cipd.bat
13
cipd.bat
@@ -10,6 +10,7 @@ set VERSION_FILE=%~dp0cipd_client_version
|
||||
set CIPD_BINARY=%~dp0.cipd_client.exe
|
||||
set CIPD_PLATFORM=windows-amd64
|
||||
set PLATFORM_OVERRIDE_FILE=%~dp0.cipd_client_platform
|
||||
set CIPD_IMPL=%~dp0.cipd_impl.ps1
|
||||
|
||||
:: Uncomment to recognize arm64 by default.
|
||||
:: if %PROCESSOR_ARCHITECTURE%==ARM64 (
|
||||
@@ -75,13 +76,13 @@ 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.>"%~dp0.cipd_impl.ps1:Zone.Identifier"
|
||||
echo.>"%CIPD_IMPL%:Zone.Identifier"
|
||||
powershell -NoProfile -ExecutionPolicy RemoteSigned ^
|
||||
-File "%~dp0.cipd_impl.ps1" ^
|
||||
-CipdBinary "%CIPD_BINARY%" ^
|
||||
-Platform "%CIPD_PLATFORM%" ^
|
||||
-BackendURL "%CIPD_BACKEND%" ^
|
||||
-VersionFile "%VERSION_FILE%" ^
|
||||
-Command "& \"%CIPD_IMPL%\"" ^
|
||||
"-CipdBinary \"%CIPD_BINARY%\"" ^
|
||||
"-Platform \"%CIPD_PLATFORM%\"" ^
|
||||
"-BackendURL \"%CIPD_BACKEND%\"" ^
|
||||
"-VersionFile \"%VERSION_FILE%\"" ^
|
||||
<nul
|
||||
if %ERRORLEVEL% equ 0 (
|
||||
:: Need to call SELF_UPDATE to setup .cipd_version file.
|
||||
|
||||
Reference in New Issue
Block a user