Restore is_user of config. And change it to clash_srv_is_user.

JohanChane · Apr 14, 2024 · 5baee2a · 5baee2a
1 parent d99231b
commit 5baee2a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -125,6 +125,7 @@ clash_core_path: "/usr/bin/mihomo"
 clash_cfg_dir: "/srv/mihomo"
 clash_cfg_path: "/srv/mihomo/config.yaml"
 clash_srv_name: "mihomo"       # systemctl {restart | stop} <clash_srv_name>
+clash_srv_is_user: false        # true: systemctl --user ...
 ```
 
 If you have cargo, you can use `cargo install clashtui` to install clashtui.

diff --git a/README_ZH.md b/README_ZH.md
@@ -125,6 +125,7 @@ clash_core_path: "/usr/bin/mihomo"
 clash_cfg_dir: "/srv/mihomo"
 clash_cfg_path: "/srv/mihomo/config.yaml"
 clash_srv_name: "mihomo"       # systemctl {restart | stop} <clash_srv_name>
+clash_srv_is_user: false        # true: systemctl --user ...
 ```
 
 如果有 cargo 则可以使用 `cargo install clashtui` 安装 clashtui。

diff --git a/clashtui/src/utils/config.rs b/clashtui/src/utils/config.rs
@@ -7,6 +7,7 @@ pub struct ClashTuiConfig {
     pub clash_cfg_path: String,
     pub clash_core_path: String,
     pub clash_srv_name: String,
+    pub clash_srv_is_user: bool,        // true: systemctl --user ...
 
     pub edit_cmd: Option<String>,
     pub open_dir_cmd: Option<String>,

diff --git a/clashtui/src/utils/tui/impl_clashsrv.rs b/clashtui/src/utils/tui/impl_clashsrv.rs
@@ -12,7 +12,7 @@ impl ClashTuiUtil {
         match op {
             ClashSrvOp::StartClashService => {
                 let mut args = vec!["restart", self.tui_cfg.clash_srv_name.as_str()];
-                if !toolkit::is_run_as_root() {
+                if self.tui_cfg.clash_srv_is_user {
                     args.push("--user")
                 }
                 let output1 = exec("systemctl", args)?;     // Although the command execution is successful,
@@ -27,7 +27,7 @@ impl ClashTuiUtil {
             }
             ClashSrvOp::StopClashService => {
                 let mut args = vec!["stop", self.tui_cfg.clash_srv_name.as_str()];
-                if !toolkit::is_run_as_root() {
+                if self.tui_cfg.clash_srv_is_user {
                     args.push("--user")
                 }
                 let output1 = exec("systemctl", args)?;