wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-12-23 05:12:40 +03:00
Code Issues Projects Releases Wiki Activity

wezterm: add env bootstrap to mux server, too

Browse Source
This commit is contained in:
Wez Furlong 2020-10-24 23:29:52 -07:00
parent 83d604fe29
commit f8c35f191b
6 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -4174,6 +4174,7 @@ dependencies = [
"async_ossl",
"codec",
"config",
"env-bootstrap",
"filedescriptor",
"futures",
"hostname",

9
env-bootstrap/src/lib.rs
View File

@ -107,3 +107,12 @@ pub fn set_lang_from_locale() {
}
}
}
pub fn bootstrap() {
set_wezterm_executable();
#[cfg(target_os = "macos")]
set_lang_from_locale();
fixup_appimage();
}

7
wezterm-gui/src/main.rs
View File

@ -404,12 +404,7 @@ fn run() -> anyhow::Result<()> {
}
};
env_bootstrap::set_wezterm_executable();
#[cfg(target_os = "macos")]
env_bootstrap::set_lang_from_locale();
env_bootstrap::fixup_appimage();
env_bootstrap::bootstrap();
pretty_env_logger::init_timed();
stats::Stats::init()?;

1
wezterm-mux-server/Cargo.toml
View File

@ -11,6 +11,7 @@ anyhow = "1.0"
async_ossl = { path = "../async_ossl" }
codec = { path = "../codec" }
config = { path = "../config" }
env-bootstrap = { path = "../env-bootstrap" }
filedescriptor = { version="0.7", path = "../filedescriptor" }
futures = "0.3"
hostname = "0.3"

2
wezterm-mux-server/src/main.rs
View File

@ -54,6 +54,8 @@ fn main() {
}
fn run() -> anyhow::Result<()> {
env_bootstrap::bootstrap();
//stats::Stats::init()?;
config::designate_this_as_the_main_thread();
let _saver = umask::UmaskSaver::new();

7
wezterm/src/main.rs
View File

@ -179,12 +179,7 @@ fn main() {
}
fn run() -> anyhow::Result<()> {
env_bootstrap::set_wezterm_executable();
#[cfg(target_os = "macos")]
env_bootstrap::set_lang_from_locale();
env_bootstrap::fixup_appimage();
env_bootstrap::bootstrap();
pretty_env_logger::init_timed();
let _saver = umask::UmaskSaver::new();