From 5b59b439a0673dd75e05d24cd6b168842890f670 Mon Sep 17 00:00:00 2001
From: renoseven <dev@renoseven.net>
Date: Fri, 1 Aug 2025 13:18:53 +0800
Subject: [PATCH] syscare: return error if external command is an invalid
 executable

Signed-off-by: renoseven <dev@renoseven.net>
---
 syscare/src/main.rs | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/syscare/src/main.rs b/syscare/src/main.rs
index 38416f26..ff7a4ecf 100644
--- a/syscare/src/main.rs
+++ b/syscare/src/main.rs
@@ -12,9 +12,9 @@
  * See the Mulan PSL v2 for more details.
  */
 
-use std::{env, ffi::OsString, os::unix::process::CommandExt, process::Command};
+use std::{env, ffi::OsString, process::Command};
 
-use anyhow::{bail, Context, Result};
+use anyhow::{anyhow, Context, Result};
 use args::SubCommand;
 use flexi_logger::{LogSpecification, Logger, WriteMode};
 use log::{debug, LevelFilter};
@@ -41,22 +41,22 @@ const EXTERNAL_CMD_PREFIX: &str = "syscare-";
 fn exec_external_cmd(mut args: Vec<OsString>) -> Result<()> {
     let program = concat_os!(EXTERNAL_CMD_PREFIX, args.remove(0).trim());
 
-    let error = Command::new(&program).args(&args).exec();
-    match error.kind() {
-        std::io::ErrorKind::NotFound => {
-            bail!(
+    let _ = Command::new(&program)
+        .args(&args)
+        .status()
+        .map_err(|e| match e.kind() {
+            std::io::ErrorKind::NotFound => anyhow!(
                 "External command '{}' is not installed",
                 program.to_string_lossy()
-            );
-        }
-        _ => {
-            bail!(
-                "Failed to execute '{}', {}",
+            ),
+            _ => anyhow!(
+                "Failed to execute '{}': {}",
                 program.to_string_lossy(),
-                error
-            );
-        }
-    }
+                e.to_string().to_lowercase()
+            ),
+        })?;
+
+    Ok(())
 }
 
 fn main() -> Result<()> {
-- 
Gitee