Eggactyl/shell
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases 1 Packages Wiki Activity Actions

add error message to failing commands *facepalm*

Browse source
This commit is contained in:
Shane C 2024-09-19 11:03:10 -04:00
parent 0466a423ec
commit 5827a7434b
Signed by: shane
GPG key ID: E46B5FEA35B22FF9
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
linux/run.go
View file

@ -2,9 +2,11 @@ package linux
import ( import (
"bufio" "bufio"
"bytes"
"errors" "errors"
"fmt" "fmt"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
"io"
"os" "os"
"os/exec" "os/exec"
"os/signal" "os/signal"
@ -192,7 +194,11 @@ func (cmd *LinuxCommand) Run() error {
} }
exitInfo.HasSucceeded = false exitInfo.HasSucceeded = false
exitInfo.ExitCode = exitErr.ExitCode() exitInfo.ExitCode = exitErr.ExitCode()
exitInfo.Error = exitErr.String() var stdoutData bytes.Buffer
if _, err := io.Copy(&stdoutData, cmd.stdout); err != nil {
return err
}
exitInfo.Error = stdoutData.String()
err := h.(func(data EventExitData) error)(*exitInfo) err := h.(func(data EventExitData) error)(*exitInfo)
if err != nil { if err != nil {
return fmt.Errorf("%s: %w", ErrRunningEvt.Error(), err) return fmt.Errorf("%s: %w", ErrRunningEvt.Error(), err)
@ -206,7 +212,11 @@ func (cmd *LinuxCommand) Run() error {
} }
exitInfo.HasSucceeded = false exitInfo.HasSucceeded = false
exitInfo.ExitCode = exitErr.ExitCode() exitInfo.ExitCode = exitErr.ExitCode()
exitInfo.Error = exitErr.String() var stdoutData bytes.Buffer
if _, err := io.Copy(&stdoutData, cmd.stdout); err != nil {
return err
}
exitInfo.Error = stdoutData.String()
err := h.(func(data EventExitData) error)(*exitInfo) err := h.(func(data EventExitData) error)(*exitInfo)
if err != nil { if err != nil {
return fmt.Errorf("%s: %w", ErrRunningEvt.Error(), err) return fmt.Errorf("%s: %w", ErrRunningEvt.Error(), err)