openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-11-02 19:43:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

rc path fix

Browse Source
This commit is contained in:
jimmyfraiture
2025-09-08 17:54:28 -07:00
parent 81e624741b
commit c39316bdb9
1 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/core/src/shell.rs
+31 -18
View File
@@ -167,8 +167,17 @@ async fn detect_default_user_shell(session_id: Uuid, codex_home: &Path) -> Shell
.into_owned();
let home_path = CStr::from_ptr((*pw).pw_dir).to_string_lossy().into_owned();
let rc_path = if shell_path.ends_with("/zsh") {
format!("{home_path}/.zshrc")
} else if shell_path.ends_with("/bash") {
format!("{home_path}/.bashrc")
} else {
return Shell::Unknown;
};
let snapshot_path = snapshots::ensure_posix_snapshot(
&shell_path,
&rc_path,
Path::new(&home_path),
codex_home,
session_id,
@@ -180,14 +189,6 @@ async fn detect_default_user_shell(session_id: Uuid, codex_home: &Path) -> Shell
let shell_snapshot =
snapshot_path.map(|snapshot| Arc::new(ShellSnapshot::new(snapshot)));
let rc_path = if shell_path.ends_with("/zsh") {
format!("{home_path}/.zshrc")
} else if shell_path.ends_with("/bash") {
format!("{home_path}/.bashrc")
} else {
return Shell::Unknown;
};
return Shell::Posix(PosixShell {
shell_path,
rc_path,
@@ -276,6 +277,7 @@ mod snapshots {
pub(crate) async fn ensure_posix_snapshot(
shell_path: &str,
rc_path: &str,
home: &Path,
codex_home: &Path,
session_id: Uuid,
@@ -310,7 +312,7 @@ mod snapshots {
return Some(snapshot_path);
}
match regenerate_posix_snapshot(shell_path, home, &snapshot_path).await {
match regenerate_posix_snapshot(shell_path, rc_path, home, &snapshot_path).await {
Ok(()) => Some(snapshot_path),
Err(err) => {
tracing::warn!("failed to generate posix snapshot: {err}");
@@ -321,6 +323,7 @@ mod snapshots {
async fn regenerate_posix_snapshot(
shell_path: &str,
rc_path: &str,
home: &Path,
snapshot_path: &Path,
) -> std::io::Result<()> {
@@ -333,7 +336,7 @@ mod snapshots {
capture_script.push_str(&format!("{profile_sources}; "));
}
let zshrc = home.join(".zshrc");
let zshrc = home.join(rc_path);
capture_script.push_str(
&format!(". {}; setopt posixbuiltins; export -p; {{ alias | sed 's/^/alias /'; }} 2>/dev/null || true", zshrc.display()),
@@ -519,10 +522,15 @@ mod macos_tests {
.unwrap();
let session_id = Uuid::new_v4();
let snapshot_path =
ensure_posix_snapshot(shell_path, temp_home.path(), codex_home.path(), session_id)
.await
.expect("snapshot path");
let snapshot_path = ensure_posix_snapshot(
shell_path,
".zshrc",
temp_home.path(),
codex_home.path(),
session_id,
)
.await
.expect("snapshot path");
let filename = snapshot_path
.file_name()
@@ -532,10 +540,15 @@ mod macos_tests {
assert!(filename.contains(&session_id.to_string()));
assert!(snapshot_path.exists());
let snapshot_path_second =
ensure_posix_snapshot(shell_path, temp_home.path(), codex_home.path(), session_id)
.await
.expect("snapshot path");
let snapshot_path_second = ensure_posix_snapshot(
shell_path,
".zshrc",
temp_home.path(),
codex_home.path(),
session_id,
)
.await
.expect("snapshot path");
assert_eq!(snapshot_path, snapshot_path_second);
let contents = std::fs::read_to_string(&snapshot_path).unwrap();