wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-12-24 13:52:55 +03:00
Code Issues Projects Releases Wiki Activity

pty: use locally set PATH when searching PATH

Browse Source 
refs: https://github.com/wez/wezterm/issues/1029
This commit is contained in:
Wez Furlong 2021-08-16 08:52:56 -07:00
parent 769f632a26
commit 935c1f4829
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pty/src/cmdbuilder.rs
View File

@ -129,7 +129,17 @@ impl CommandBuilder {
self.umask = mask;
}
fn search_path(exe: &OsStr, cwd: &OsStr) -> anyhow::Result<OsString> {
fn resolve_path(&self) -> Option<OsString> {
for (k, v) in &self.envs {
if k == "PATH" {
return Some(v.clone());
}
}
std::env::var_os("PATH")
}
fn search_path(&self, exe: &OsStr, cwd: &OsStr) -> anyhow::Result<OsString> {
use std::path::Path;
let exe_path: &Path = exe.as_ref();
if exe_path.is_relative() {
@ -139,7 +149,7 @@ impl CommandBuilder {
return Ok(abs_path.into_os_string());
}
if let Some(path) = std::env::var_os("PATH") {
if let Some(path) = self.resolve_path() {
for path in std::env::split_paths(&path) {
let candidate = path.join(&exe);
if candidate.exists() {
@ -187,7 +197,7 @@ impl CommandBuilder {
cmd.arg0(&format!("-{}", basename));
cmd
} else {
let resolved = Self::search_path(&self.args[0], dir)?;
let resolved = self.search_path(&self.args[0], dir)?;
let mut cmd = std::process::Command::new(&resolved);
cmd.arg0(&self.args[0]);
cmd.args(&self.args[1..]);