exit error code fetch from exec.Command

paramah · Dec 6, 2021 · 7edfb5c · 7edfb5c
1 parent 36d4292
commit 7edfb5c
Showing 1 changed file with 44 additions and 2 deletions.
diff --git a/app/modules/context/context.go b/app/modules/context/context.go
@@ -5,9 +5,11 @@ import (
 	"github.com/urfave/cli/v2"
 	"ledo/app/modules/config"
 	"ledo/app/modules/mode"
+	"log"
 	"os"
 	"os/exec"
 	"strings"
+	"syscall"
 )
 
 type LedoContext struct {
@@ -79,13 +81,53 @@ func (lx *LedoContext) ExecCmd(cmd string, cmdArgs []string) error {
 	command.Stdin = os.Stdin
 	command.Stdout = os.Stdout
 	command.Stderr = os.Stderr
-	return command.Run()
+
+	if err := command.Start(); err != nil {
+        log.Fatalf("cmd.Start: %v", err)
+		os.Exit(1)
+		return err
+    }
+
+    if err := command.Wait(); err != nil {
+        if exiterr, ok := err.(*exec.ExitError); ok {
+            if status, ok := exiterr.Sys().(syscall.WaitStatus); ok {
+                log.Printf("Exit Status: %d", status.ExitStatus())
+				os.Exit(status.ExitStatus())
+				return err
+            }
+        } else {
+            log.Fatalf("cmd.Wait: %v", err)
+			os.Exit(1)
+			return err
+        }
+    }
+	return nil
 }
 
 func (lx *LedoContext) ExecCmdSilent(cmd string, cmdArgs []string) error {
 	command := exec.Command(cmd, cmdArgs...)
 	command.Stdin = os.Stdin
 	command.Stdout = os.Stdout
 	command.Stderr = nil
-	return command.Run()
+
+	if err := command.Start(); err != nil {
+        log.Fatalf("cmd.Start: %v", err)
+		os.Exit(1)
+		return err
+    }
+
+    if err := command.Wait(); err != nil {
+        if exiterr, ok := err.(*exec.ExitError); ok {
+            if status, ok := exiterr.Sys().(syscall.WaitStatus); ok {
+                log.Printf("Exit Status: %d", status.ExitStatus())
+				os.Exit(status.ExitStatus())
+				return err
+            }
+        } else {
+            log.Fatalf("cmd.Wait: %v", err)
+			os.Exit(1)
+			return err
+        }
+    }
+	return nil
 }