wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-11-28 01:06:37 +03:00
Code Issues Projects Releases Wiki Activity

remove daemonize option from the gui

Browse Source 
This is a mux only option
This commit is contained in:
Wez Furlong 2020-10-04 14:19:06 -07:00
parent 19cea53e35
commit 68ab42f17a
1 changed files with 0 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
wezterm/src/main.rs
View File

@ -91,10 +91,6 @@ struct StartCommand {
#[structopt(long = "no-auto-connect")] #[structopt(long = "no-auto-connect")]
no_auto_connect: bool, no_auto_connect: bool,
/// Detach from the foreground and become a background process
#[structopt(long = "daemonize")]
daemonize: bool,
/// Specify the current working directory for the initially /// Specify the current working directory for the initially
/// spawned program /// spawned program
#[structopt(long = "cwd", parse(from_os_str))] #[structopt(long = "cwd", parse(from_os_str))]
@ -486,59 +482,6 @@ async fn async_run_terminal_gui(
} }
fn run_terminal_gui(config: config::ConfigHandle, opts: StartCommand) -> anyhow::Result<()> { fn run_terminal_gui(config: config::ConfigHandle, opts: StartCommand) -> anyhow::Result<()> {
#[cfg(unix)]
{
if opts.daemonize {
let stdout = config.daemon_options.open_stdout()?;
let stderr = config.daemon_options.open_stderr()?;
let mut daemonize = daemonize::Daemonize::new()
.stdout(stdout)
.stderr(stderr)
.working_directory(config::HOME_DIR.clone());
if !config::running_under_wsl() {
// pid file locking is only partly function when running under
// WSL 1; it is possible for the pid file to exist after a reboot
// and for attempts to open and lock it to fail when there are no
// other processes that might possibly hold a lock on it.
// So, we only use a pid file when not under WSL.
daemonize = daemonize.pid_file(config.daemon_options.pid_file());
}
if let Err(err) = daemonize.start() {
use daemonize::DaemonizeError;
match err {
DaemonizeError::OpenPidfile
| DaemonizeError::LockPidfile(_)
| DaemonizeError::ChownPidfile(_)
| DaemonizeError::WritePid => {
bail!("{} {}", err, config.daemon_options.pid_file().display());
}
DaemonizeError::ChangeDirectory => {
bail!("{} {}", err, config::HOME_DIR.display());
}
_ => return Err(err.into()),
}
}
// Remove some environment variables that aren't super helpful or
// that are potentially misleading when we're starting up the
// server.
// We may potentially want to look into starting/registering
// a session of some kind here as well in the future.
for name in &[
"OLDPWD",
"PWD",
"SHLVL",
"SSH_AUTH_SOCK",
"SSH_CLIENT",
"SSH_CONNECTION",
"_",
] {
std::env::remove_var(name);
}
}
}
opts.font_locator opts.font_locator
.unwrap_or(config.font_locator) .unwrap_or(config.font_locator)
.set_default(); .set_default();