sync

Author: ddkwork

stream/cmd/command.go

@@ -17,23 +17,36 @@ import (
 )
 
 type Session struct {
-	dir       string
 	pid       chan int
 	logWriter io.Writer
+	*exec.Cmd
+	Result           string
+	CurrentDirectory string
 }
 
 func MakeArg(arg ...string) string {
 	args := make([]string, 0)
 	args = append(args, arg...)
 	return strings.Join(args, " ")
 }
-func RunArgs(arg ...string) string { return Run(MakeArg(arg...)) }
-func Run(command string) string {
-	return NewSession().run(context.Background(), command)
+func RunArgs(arg ...string) *Session { return Run(MakeArg(arg...)) }
+func Run(command string) *Session {
+	session := NewSession()
+	session.Result = session.run(context.Background(), command)
+	return session
 }
 
-func NewSession() *Session             { return &Session{pid: make(chan int, 1)} }
-func (s *Session) SetDir(dir string)   { s.dir = strings.TrimSpace(dir) }
+func NewSession() *Session {
+	return &Session{
+		pid:              make(chan int, 1),
+		logWriter:        nil,
+		Cmd:              nil,
+		Result:           "",
+		CurrentDirectory: "",
+	}
+}
+
+func (s *Session) SetDir(dir string)   { s.Dir = strings.TrimSpace(dir) }
 func (s *Session) SetLog(wr io.Writer) { s.logWriter = wr }
 func (s *Session) GetPid() <-chan int  { return s.pid }
 func (s *Session) run(ctx context.Context, command string) (ss string) {
@@ -44,8 +57,13 @@ func (s *Session) run(ctx context.Context, command string) (ss string) {
 		return exec.Command("bash", "-c", command) //"linux", "darwin", "freebsd":
 	}
 	cmd := fnInitCmd()
+	s.Cmd = cmd
+	dir, err := os.Getwd()
+	if !mylog.Error(err) {
+		return
+	}
+	s.CurrentDirectory = dir
 
-	cmd.Dir = s.dir
 	mylog.Warning("go-command", cmd.String())
 	outputErr := &bytes.Buffer{}
 	outputOut := &bytes.Buffer{}