Refresh cmd installer PATH after install
ci / test (push) Canceled after 0s
ci / fuzz-smoke (push) Canceled after 0s
ci / macos-client (macos-aarch64, macos-14) (push) Canceled after 0s
ci / macos-client (macos-x86_64, macos-13) (push) Canceled after 0s
ci / windows-client (push) Canceled after 0s
ci / package-release (linux-x86_64, ubuntu-latest, , , ) (push) Canceled after 0s
ci / package-release (macos-aarch64, macos-14, , , ) (push) Canceled after 0s
ci / package-release (macos-x86_64, macos-13, , , ) (push) Canceled after 0s
ci / package-release (windows-aarch64, windows-latest, aarch64, windows, aarch64-pc-windows-msvc) (push) Canceled after 0s
ci / package-release (windows-x86_64, windows-latest, , , ) (push) Canceled after 0s
ci / remote-bench (push) Canceled after 0s
ci / publish-gitea-release (push) Canceled after 0s
ci / test (push) Canceled after 0s
ci / fuzz-smoke (push) Canceled after 0s
ci / macos-client (macos-aarch64, macos-14) (push) Canceled after 0s
ci / macos-client (macos-x86_64, macos-13) (push) Canceled after 0s
ci / windows-client (push) Canceled after 0s
ci / package-release (linux-x86_64, ubuntu-latest, , , ) (push) Canceled after 0s
ci / package-release (macos-aarch64, macos-14, , , ) (push) Canceled after 0s
ci / package-release (macos-x86_64, macos-13, , , ) (push) Canceled after 0s
ci / package-release (windows-aarch64, windows-latest, aarch64, windows, aarch64-pc-windows-msvc) (push) Canceled after 0s
ci / package-release (windows-x86_64, windows-latest, , , ) (push) Canceled after 0s
ci / remote-bench (push) Canceled after 0s
ci / publish-gitea-release (push) Canceled after 0s
This commit is contained in:
+11
-1
@@ -29,4 +29,14 @@ if errorlevel 1 (
|
|||||||
"%PS%" -NoProfile -ExecutionPolicy Bypass -File "%TMP_PS%" %*
|
"%PS%" -NoProfile -ExecutionPolicy Bypass -File "%TMP_PS%" %*
|
||||||
set "RC=%ERRORLEVEL%"
|
set "RC=%ERRORLEVEL%"
|
||||||
del "%TMP_PS%" >nul 2>nul
|
del "%TMP_PS%" >nul 2>nul
|
||||||
exit /b %RC%
|
|
||||||
|
set "DOSH_CMD_PREFIX=%PREFIX%"
|
||||||
|
if "%DOSH_CMD_PREFIX%"=="" set "DOSH_CMD_PREFIX=%USERPROFILE%\.local"
|
||||||
|
set "DOSH_CMD_BINDIR=%DOSH_CMD_PREFIX%\bin"
|
||||||
|
set "DOSH_NEXT_PATH=%PATH%"
|
||||||
|
if "%RC%"=="0" (
|
||||||
|
echo ;%PATH%; | find /I ";%DOSH_CMD_BINDIR%;" >nul 2>nul
|
||||||
|
if errorlevel 1 set "DOSH_NEXT_PATH=%DOSH_CMD_BINDIR%;%PATH%"
|
||||||
|
)
|
||||||
|
|
||||||
|
endlocal & set "PATH=%DOSH_NEXT_PATH%" & exit /b %RC%
|
||||||
|
|||||||
@@ -259,7 +259,16 @@ fn windows_cmd_installer_wraps_native_powershell_installer() {
|
|||||||
assert!(cmd.contains("for %%P in (powershell.exe pwsh.exe powershell pwsh) do"));
|
assert!(cmd.contains("for %%P in (powershell.exe pwsh.exe powershell pwsh) do"));
|
||||||
assert!(cmd.contains("Invoke-WebRequest -UseBasicParsing"));
|
assert!(cmd.contains("Invoke-WebRequest -UseBasicParsing"));
|
||||||
assert!(cmd.contains("-ExecutionPolicy Bypass -File \"%TMP_PS%\" %*"));
|
assert!(cmd.contains("-ExecutionPolicy Bypass -File \"%TMP_PS%\" %*"));
|
||||||
assert!(cmd.contains("exit /b %RC%"));
|
assert!(cmd.contains("set \"DOSH_CMD_PREFIX=%PREFIX%\""));
|
||||||
|
assert!(
|
||||||
|
cmd.contains(
|
||||||
|
"if \"%DOSH_CMD_PREFIX%\"==\"\" set \"DOSH_CMD_PREFIX=%USERPROFILE%\\.local\""
|
||||||
|
)
|
||||||
|
);
|
||||||
|
assert!(cmd.contains("set \"DOSH_CMD_BINDIR=%DOSH_CMD_PREFIX%\\bin\""));
|
||||||
|
assert!(cmd.contains("echo ;%PATH%; | find /I \";%DOSH_CMD_BINDIR%;\""));
|
||||||
|
assert!(cmd.contains("set \"DOSH_NEXT_PATH=%DOSH_CMD_BINDIR%;%PATH%\""));
|
||||||
|
assert!(cmd.contains("endlocal & set \"PATH=%DOSH_NEXT_PATH%\" & exit /b %RC%"));
|
||||||
assert!(readme.contains("Windows client from `cmd.exe`:"));
|
assert!(readme.contains("Windows client from `cmd.exe`:"));
|
||||||
assert!(readme.contains("install.cmd"));
|
assert!(readme.contains("install.cmd"));
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user