root/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev.git synced 2026-01-29 17:15:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(linux): retry with sudo when pkexec execution failed (#5469)

Browse Source
This commit is contained in:
Su Guoyu
2025-11-16 14:52:13 +08:00
committed by GitHub
parent dbb4877be6
commit 29d8df40b9
1 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src-tauri/src/core/service.rs
View File

@@ -136,11 +136,28 @@ async fn uninstall_service() -> Result<()> {
let status = if linux_running_as_root() {
StdCommand::new(&uninstall_path).status()?
} else {
StdCommand::new(elevator)
let result = StdCommand::new(&elevator)
.arg("sh")
.arg("-c")
.arg(uninstall_shell)
.status()?
.arg(&uninstall_shell)
.status()?;
// 如果 pkexec 执行失败，回退到 sudo
if !result.success() && elevator.contains("pkexec") {
logging!(
warn,
Type::Service,
"pkexec failed with code {}, falling back to sudo",
result.code().unwrap_or(-1)
);
StdCommand::new("sudo")
.arg("sh")
.arg("-c")
.arg(&uninstall_shell)
.status()?
} else {
result
}
};
logging!(
info,
@@ -177,11 +194,28 @@ async fn install_service() -> Result<()> {
let status = if linux_running_as_root() {
StdCommand::new(&install_path).status()?
} else {
StdCommand::new(elevator)
let result = StdCommand::new(&elevator)
.arg("sh")
.arg("-c")
.arg(install_shell)
.status()?
.arg(&install_shell)
.status()?;
// 如果 pkexec 执行失败，回退到 sudo
if !result.success() && elevator.contains("pkexec") {
logging!(
warn,
Type::Service,
"pkexec failed with code {}, falling back to sudo",
result.code().unwrap_or(-1)
);
StdCommand::new("sudo")
.arg("sh")
.arg("-c")
.arg(&install_shell)
.status()?
} else {
result
}
};
logging!(
info,