Use configured default program when running subcommand "start" #851
Conversation
…WD option set and program unset
…ive working dir has been specified
There was a problem hiding this comment.
Thanks for digging in!
I've made a suggested alternative way to fix this bug below.
I'd prefer it if you separated out the other change to the GUI current dir as I don't think it is related to this issue and I'm not sure of your intent with that change.
Thanks!
| @@ -326,7 +327,13 @@ fn run_terminal_gui(opts: StartCommand) -> anyhow::Result<()> { | |||
|
|
|||
| let cmd = if need_builder { | |||
There was a problem hiding this comment.
I think doing this is a little cleaner:
| let cmd = if need_builder { | |
| let config = config::configuration(); | |
| let prog = opts.prog.iter().map(|s| s.as_os_str()).collect::<Vec<_>>(); | |
| let mut builder = config.build_prog(if prog.is_empty() { None } else { Some(prog) })?; | |
| if let Some(cwd) = opts.cwd { | |
| builder.cwd(cwd); | |
| } | |
| Some(builder) |
| @@ -508,7 +517,22 @@ fn run() -> anyhow::Result<()> { | |||
| SetStdHandle(STD_ERROR_HANDLE, stderr.into_raw_file_descriptor()); | |||
| */ | |||
|
|
|||
| std::env::set_current_dir(config::HOME_DIR.as_path())?; | |||
| // Only change the current directory to the user's home path if | |||
There was a problem hiding this comment.
This doesn't appear to be related to the issue that you set out to resolve in the PR.
Please remove it from here and track this separately, along with an explanation of why it is needed.
FWIW, I don't think this is necessary: this is controlling the current directory of the GUI process itself, and not its child processes.
There was a problem hiding this comment.
This is for starting wezterm in the current working directory from a GUI context. My use case is starting a terminal from my file manager, which starts the process in the currently opened directory. Since there's no console available, the current directory gets reset to the user's home directory. I'll put this into a separate PR.
|
Thanks; I pulled in and amended the first part of this! |
Running
wezterm-gui start --cwd .starts the system's default shell, regardless of the configureddefault_prog. This PR fixes that.