openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-10-22 17:58:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prefer real PowerShell executables on Windows

Browse Source
This commit is contained in:
David Wiesen
2026-04-29 12:05:47 -07:00
parent 5cf0adba93
commit 29f1b6299a
1 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/core/src/shell.rs
+27
View File
@@ -1,5 +1,9 @@
use crate::shell_detect::detect_shell_type;
use crate::shell_snapshot::ShellSnapshot;
#[cfg(windows)]
use codex_shell_command::powershell::try_find_powershell_executable_blocking;
#[cfg(windows)]
use codex_shell_command::powershell::try_find_pwsh_executable_blocking;
use serde::Deserialize;
use serde::Serialize;
use std::path::PathBuf;
@@ -250,6 +254,29 @@ const POWERSHELL_FALLBACK_PATHS: &[&str] =
const POWERSHELL_FALLBACK_PATHS: &[&str] = &[];
fn get_powershell_shell(path: Option<&PathBuf>) -> Option<Shell> {
#[cfg(windows)]
let shell_path = path
.and_then(file_exists)
.or_else(|| try_find_pwsh_executable_blocking().map(|path| path.into_path_buf()))
.or_else(|| try_find_powershell_executable_blocking().map(|path| path.into_path_buf()))
.or_else(|| {
get_shell_path(
ShellType::PowerShell,
/* provided_path */ None,
"pwsh",
PWSH_FALLBACK_PATHS,
)
})
.or_else(|| {
get_shell_path(
ShellType::PowerShell,
/* provided_path */ None,
"powershell",
POWERSHELL_FALLBACK_PATHS,
)
});
#[cfg(not(windows))]
let shell_path = get_shell_path(ShellType::PowerShell, path, "pwsh", PWSH_FALLBACK_PATHS)
.or_else(|| {
get_shell_path(