Merge 835436c50f into sapling-pr-archive-bolinfest

This commit is contained in:
Michael Bolin
2026-03-26 23:00:51 -07:00
committed by GitHub

View File

@@ -41,11 +41,15 @@ if not defined manifest if exist "%~dpn0.runfiles_manifest" set "manifest=%~dpn0
if not defined manifest if exist "%~f0.exe.runfiles_manifest" set "manifest=%~f0.exe.runfiles_manifest"
if defined manifest if exist "%manifest%" (
for /f "usebackq tokens=1,* delims= " %%A in (`findstr /b /c:"%logical_path% " "%manifest%"`) do (
endlocal & set "%~1=%%B" & exit /b 0
)
for /f "usebackq tokens=1,* delims= " %%A in (`findstr /b /c:"%workspace_logical_path% " "%manifest%"`) do (
endlocal & set "%~1=%%B" & exit /b 0
rem Read the manifest directly instead of shelling out to findstr. The
rem nested command path mangles Windows manifest filenames in CI.
for /f "usebackq tokens=1,* delims= " %%A in ("%manifest%") do (
if "%%A"=="%logical_path%" (
endlocal & set "%~1=%%B" & exit /b 0
)
if "%%A"=="%workspace_logical_path%" (
endlocal & set "%~1=%%B" & exit /b 0
)
)
)