weyne/rustdesk
1
0
Fork 0
mirror of https://github.com/weyne85/rustdesk.git synced 2025-10-29 17:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

mac tray work

Browse Source
This commit is contained in:
rustdesk
2022-04-29 16:21:18 +08:00
parent 8df1e42977
commit e2c9b78254
6 changed files with 54 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/platform/macos.rs
View File

@@ -145,6 +145,14 @@ pub fn is_installed_daemon(prompt: bool) -> bool {
.args(&["load", "-w", &agent_plist_file])
.status()
.ok();
std::process::Command::new("sh")
.arg("-c")
.arg(&format!(
"sleep 0.5; open -n /Applications/{}.app",
crate::get_app_name(),
))
.spawn()
.ok();
quit_gui();
}
}
@@ -166,7 +174,6 @@ pub fn uninstall() -> bool {
match std::process::Command::new("osascript")
.arg("-e")
.arg(script_body)
.arg(&get_active_username())
.status()
{
Err(e) => {
@@ -189,18 +196,11 @@ pub fn uninstall() -> bool {
.args(&["remove", &format!("{}_server", crate::get_full_name())])
.status()
.ok();
std::process::Command::new("osascript")
.arg("-e")
.arg(
PRIVILEGES_SCRIPTS_DIR
.get_file("run.scpt")
.unwrap()
.contents_utf8()
.unwrap(),
)
std::process::Command::new("sh")
.arg("-c")
.arg(&format!(
"sleep 0.5; open /Applications/{}.app",
crate::get_full_name(),
crate::get_app_name(),
))
.spawn()
.ok();
@@ -433,7 +433,6 @@ pub fn start_os_service() {
])
.status()
.ok();
// if above spawn, we may need sleep for a while here.
std::process::exit(0);
}
}

6
src/platform/privileges_scripts/run.scpt
View File

@@ -1,6 +0,0 @@
on run {cmd}
set sh to "" & cmd
do shell script sh
end run