SagerNet/sing
1
0
Fork 0
mirror of https://github.com/SagerNet/sing.git synced 2025-04-03 20:07:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Print command to shell error

Browse source
This commit is contained in:
世界 2023-03-13 11:27:57 +08:00
parent b8ca9f5424
commit 448948d26d
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

25
common/shell.go → common/shell/shell.go
View file

@ -1,9 +1,11 @@
package common package shell
import ( import (
"os" "os"
"os/exec" "os/exec"
"strings" "strings"
E "github.com/sagernet/sing/common/exceptions"
) )
type Shell struct { type Shell struct {
@ -33,12 +35,27 @@ func (s *Shell) SetEnv(env []string) *Shell {
return s return s
} }
func (s *Shell) Wait() error {
return s.buildError(s.Cmd.Wait())
}
func (s *Shell) Run() error {
return s.buildError(s.Cmd.Run())
}
func (s *Shell) Read() (string, error) { func (s *Shell) Read() (string, error) {
output, err := s.CombinedOutput() output, err := s.CombinedOutput()
return string(output), err return string(output), s.buildError(err)
} }
func (s *Shell) ReadOutput() (string, error) { func (s *Shell) ReadOutput() (string, error) {
output, err := s.Output() output, err := s.Output()
return strings.TrimSpace(string(output)), err return strings.TrimSpace(string(output)), s.buildError(err)
} }
func (s *Shell) buildError(err error) error {
if err == nil {
return nil
}
return E.Cause(err, "execute (", s.Path, ") ", strings.Join(s.Args, " "))
}