wit
/
shell
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

allow stdout redirection 

Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
Jeff Carr 2019-05-09 22:20:26 +00:00
parent 7048640de6
commit 026c59bc5c
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
shell.go
View File

@ -10,6 +10,9 @@ import "bufio"
import "github.com/davecgh/go-spew/spew" import "github.com/davecgh/go-spew/spew"
import "github.com/svent/go-nbreader" import "github.com/svent/go-nbreader"
var shellStdout *os.File
var shellStderr *os.File
func Script(cmds string) int { func Script(cmds string) int {
// split on new lines (while we are at it, handle stupid windows text files // split on new lines (while we are at it, handle stupid windows text files
lines := strings.Split(strings.Replace(cmds, "\r\n", "\n", -1), "\n") lines := strings.Split(strings.Replace(cmds, "\r\n", "\n", -1), "\n")
@ -23,6 +26,14 @@ func Script(cmds string) int {
return 0 return 0
} }
func SetStdout(newout *os.File) {
shellStdout = newout
}
func SetStderr(newerr *os.File) {
shellStderr = newerr
}
func Run(cmdline string) int { func Run(cmdline string) int {
log.Println("START " + cmdline) log.Println("START " + cmdline)
@ -42,16 +53,23 @@ func Run(cmdline string) int {
} }
process := exec.Command(cmdArgs[0], cmdArgs[1:len(cmdArgs)]...) process := exec.Command(cmdArgs[0], cmdArgs[1:len(cmdArgs)]...)
stdout, _ := process.StdoutPipe() pstdout, _ := process.StdoutPipe()
stderr, _ := process.StderrPipe() pstderr, _ := process.StderrPipe()
spew.Dump(pstdout)
process.Start() process.Start()
f := bufio.NewWriter(os.Stdout) if (shellStdout == nil) {
shellStdout = os.Stdout
}
newreader := bufio.NewReader(stdout) f := bufio.NewWriter(shellStdout)
newreader := bufio.NewReader(pstdout)
nbr := nbreader.NewNBReader(newreader, 1024) nbr := nbreader.NewNBReader(newreader, 1024)
newerrreader := bufio.NewReader(stderr) newerrreader := bufio.NewReader(pstderr)
nbrerr := nbreader.NewNBReader(newerrreader, 1024) nbrerr := nbreader.NewNBReader(newerrreader, 1024)
for { for {