wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-11-26 16:34:23 +03:00
Code Issues Projects Releases Wiki Activity

LocalDomain: don't use global default_prog/default_cwd for WslDomains

Browse Source 
They have their own versions of these options, and logically it doesn't
make sense to use the default_prog from the `local` domain with a wsl
domain.

refs: #1242
This commit is contained in:
Wez Furlong 2022-01-08 16:07:22 -07:00
parent 71bfa38cf4
commit 3e99390299
2 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/src/wsl.rs
View File

@ -6,7 +6,7 @@ pub struct WslDomain {
pub name: String,
pub distribution: Option<String>,
pub username: Option<String>,
pub default_cwd: Option<String>,
pub default_cwd: Option<PathBuf>,
pub default_prog: Option<Vec<String>>,
}
impl_lua_conversion!(WslDomain);

64
mux/src/domain.rs
View File

@ -181,6 +181,36 @@ impl LocalDomain {
}
}
}
fn build_command(
&self,
command: Option<CommandBuilder>,
command_dir: Option<String>,
) -> anyhow::Result<CommandBuilder> {
let config = configuration();
let mut cmd = match command {
Some(mut cmd) => {
config.apply_cmd_defaults(&mut cmd, config.default_cwd.as_ref());
cmd
}
None => config.build_prog(
None,
self.wsl
.as_ref()
.map(|wsl| wsl.default_prog.as_ref())
.unwrap_or(config.default_prog.as_ref()),
self.wsl
.as_ref()
.map(|wsl| wsl.default_cwd.as_ref())
.unwrap_or(config.default_cwd.as_ref()),
)?,
};
if let Some(dir) = command_dir {
cmd.cwd(dir);
}
self.fixup_command(&mut cmd);
Ok(cmd)
}
}
#[async_trait(?Send)]
@ -192,26 +222,11 @@ impl Domain for LocalDomain {
command_dir: Option<String>,
window: WindowId,
) -> Result<Rc<Tab>, Error> {
let config = configuration();
let mut cmd = match command {
Some(mut cmd) => {
config.apply_cmd_defaults(&mut cmd, config.default_cwd.as_ref());
cmd
}
None => config.build_prog(
None,
config.default_prog.as_ref(),
config.default_cwd.as_ref(),
)?,
};
if let Some(dir) = command_dir {
cmd.cwd(dir);
}
let mut cmd = self.build_command(command, command_dir)?;
let pair = self.pty_system.openpty(size)?;
let pane_id = alloc_pane_id();
cmd.env("WEZTERM_PANE", pane_id.to_string());
self.fixup_command(&mut cmd);
let child = pair.slave.spawn_command(cmd)?;
log::trace!("spawned: {:?}", child);
@ -274,25 +289,10 @@ impl Domain for LocalDomain {
None => anyhow::bail!("invalid pane index {}", pane_index),
};
let config = configuration();
let mut cmd = match command {
Some(mut cmd) => {
config.apply_cmd_defaults(&mut cmd, config.default_cwd.as_ref());
cmd
}
None => config.build_prog(
None,
config.default_prog.as_ref(),
config.default_cwd.as_ref(),
)?,
};
if let Some(dir) = command_dir {
cmd.cwd(dir);
}
let mut cmd = self.build_command(command, command_dir)?;
let pair = self.pty_system.openpty(split_size.second)?;
let pane_id = alloc_pane_id();
cmd.env("WEZTERM_PANE", pane_id.to_string());
self.fixup_command(&mut cmd);
let child = pair.slave.spawn_command(cmd)?;
log::trace!("spawned: {:?}", child);