修复服务执行时伴随的cmd命令的执行逻辑,更改shell服务，使其先执行about (#30)

parse_test/shell.service

@@ -4,4 +4,5 @@ Description=Shell
 [Service]
 Type=simple
 ExecStart=/bin/shell.elf
-Restart=always
+Restart=always
+ExecStartPre=-/bin/dragonos_about

src/executor/mod.rs

@@ -98,7 +98,6 @@ impl Executor {
             if UnitManager::is_running_unit(&u) {
                 continue;
             }
-
             let mutex = UnitManager::get_unit_with_id(&u).unwrap();
             let mut after = mutex.lock().unwrap();
             after.run()?;

src/executor/service_executor/mod.rs

@@ -120,7 +120,7 @@ impl ServiceExecutor {
     fn exec_start_pre(service: &ServiceUnit) -> Result<(), RuntimeError> {
         let cmds = service.service_part().exec_start_pre();
         for cmd in cmds {
-            cmd.spawn()?;
+            cmd.no_spawn()?;
         }
         Ok(())
     }

src/manager/unit_manager/mod.rs

@@ -185,11 +185,6 @@ impl UnitManager {
             .insert(proc.id(), Mutex::new(proc));
     }
 
-    // 删除对应cmd的进程
-    pub fn remove_cmd_proc(id: u32) {
-        CMD_PROCESS_TABLE.write().unwrap().remove(&id);
-    }
-
     // 弹出指定id的cmd进程
     pub fn pop_cmd_proc(id: u32) -> Option<Mutex<Child>> {
         CMD_PROCESS_TABLE.write().unwrap().remove(&id)

src/task/cmdtask/mod.rs

@@ -43,18 +43,24 @@ impl CmdTask {
             .args(&self.cmd)
             .current_dir(self.dir.clone())
             .envs(self.envs.clone())
-            .output();
+            .spawn();
+
         match result {
-            Ok(output) => {
-                print!("{}", String::from_utf8_lossy(&output.stdout));
-                eprint!("{}", String::from_utf8_lossy(&output.stderr));
-                if !output.status.success() {
-                    return Err(RuntimeError::new(RuntimeErrorType::ExecFailed));
+            Ok(mut child) => match child.wait() {
+                Ok(status) => {
+                    if !status.success() && !self.ignore {
+                        return Err(RuntimeError::new(RuntimeErrorType::ExecFailed));
+                    }
                 }
-            }
-            Err(err) => {
+                Err(_) => {
+                    if !self.ignore {
+                        return Err(RuntimeError::new(RuntimeErrorType::ExecFailed));
+                    }
+                }
+            },
+            Err(e) => {
                 if !self.ignore {
-                    eprintln!("{}: Command failed: {}", self.path, err);
+                    eprintln!("{}: Command failed: {}", self.path, e);
                     return Err(RuntimeError::new(RuntimeErrorType::ExecFailed));
                 }
             }