mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-27 10:59:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge pull request #2292 from zed-industries/restart-app

Browse source 
Make 'restart' action more reliable
This commit is contained in:
Max Brunsfeld 2023-03-15 18:01:22 -07:00 committed by GitHub
commit ed9927b495
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
crates/gpui/src/platform/mac/platform.rs
View file

@ -867,25 +867,38 @@ impl platform::Platform for MacPlatform {
} }
fn restart(&self) { fn restart(&self) {
#[cfg(debug_assertions)] use std::os::unix::process::CommandExt as _;
let path = std::env::current_exe().unwrap();
#[cfg(not(debug_assertions))] let app_pid = std::process::id().to_string();
let path = self let app_path = self
.app_path() .app_path()
.unwrap_or_else(|_| std::env::current_exe().unwrap()); .ok()
// When the app is not bundled, `app_path` returns the
// directory containing the executable. Disregard this
// and get the path to the executable itself.
.and_then(|path| (path.extension()?.to_str()? == "app").then_some(path))
.unwrap_or_else(|| std::env::current_exe().unwrap());
let script = r#"lsof -p "$0" +r 1 &>/dev/null && open "$1""#; // Wait until this process has exited and then re-open this path.
let script = r#"
while kill -0 $0 2> /dev/null; do
sleep 0.1
done
open "$1"
"#;
Command::new("/bin/bash") let restart_process = Command::new("/bin/bash")
.arg("-c") .arg("-c")
.arg(script) .arg(script)
.arg(std::process::id().to_string()) .arg(app_pid)
.arg(path) .arg(app_path)
.spawn() .process_group(0)
.ok(); .spawn();
self.quit(); match restart_process {
Ok(_) => self.quit(),
Err(e) => log::error!("failed to spawn restart script: {:?}", e),
}
} }
} }