hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3476 from 21pages/install

Browse Source 
fix reinstall
This commit is contained in:
RustDesk 2023-03-03 10:31:17 +08:00 committed by GitHub
commit ef62869bcc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core_main.rs
View File

@ -129,7 +129,7 @@ pub fn core_main() -> Option<Vec<String>> {
{ {
use crate::platform; use crate::platform;
if args[0] == "--uninstall" { if args[0] == "--uninstall" {
if let Err(err) = platform::uninstall_me() { if let Err(err) = platform::uninstall_me(true) {
log::error!("Failed to uninstall: {}", err); log::error!("Failed to uninstall: {}", err);
} }
return None; return None;
@ -147,7 +147,7 @@ pub fn core_main() -> Option<Vec<String>> {
hbb_common::allow_err!(platform::update_me()); hbb_common::allow_err!(platform::update_me());
return None; return None;
} else if args[0] == "--reinstall" { } else if args[0] == "--reinstall" {
hbb_common::allow_err!(platform::uninstall_me()); hbb_common::allow_err!(platform::uninstall_me(false));
hbb_common::allow_err!(platform::install_me( hbb_common::allow_err!(platform::install_me(
"desktopicon startmenu", "desktopicon startmenu",
"".to_owned(), "".to_owned(),

4
src/platform/windows.rs
View File

@ -1235,8 +1235,8 @@ fn get_uninstall(kill_self: bool) -> String {
) )
} }
pub fn uninstall_me() -> ResultType<()> { pub fn uninstall_me(kill_self: bool) -> ResultType<()> {
run_cmds(get_uninstall(true), true, "uninstall") run_cmds(get_uninstall(kill_self), true, "uninstall")
} }
fn write_cmds(cmds: String, ext: &str, tip: &str) -> ResultType<std::path::PathBuf> { fn write_cmds(cmds: String, ext: &str, tip: &str) -> ResultType<std::path::PathBuf> {