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

quiet output 

Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
Jeff Carr 2019-06-07 00:36:46 -07:00
parent 8db41cc911
commit b56c3fe1f6
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
shell.go
View File

@ -22,13 +22,14 @@ var shellStdout *os.File
var shellStderr *os.File var shellStderr *os.File
var spewOn bool = false var spewOn bool = false
var quiet bool = false
var msecDelay int = 20 // number of milliseconds to delay between reads with no data var msecDelay int = 20 // number of milliseconds to delay between reads with no data
var bytesBuffer bytes.Buffer var bytesBuffer bytes.Buffer
var bytesSplice []byte var bytesSplice []byte
func handleError(c interface{}, ret int) { func handleError(c interface{}, ret int) {
log.Println("shell.Run() Returned", ret) log.Debug("shell.Run() Returned", ret)
if (callback != nil) { if (callback != nil) {
callback(c, ret) callback(c, ret)
} }
@ -42,6 +43,11 @@ func InitCallback(f func(interface{}, int)) {
callback = f callback = f
} }
// this means it won't copy all the output to STDOUT
func Quiet() {
quiet = true
}
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")
@ -140,8 +146,10 @@ func Run(cmdline string) string {
oneByte = make([]byte, 1024) oneByte = make([]byte, 1024)
count, err = nbr.Read(oneByte) count, err = nbr.Read(oneByte)
log.Debug("STDOUT: count = ", count) log.Debug("STDOUT: count = ", count)
f.Write(oneByte[0:count]) if (! quiet) {
f.Flush() f.Write(oneByte[0:count])
f.Flush()
}
empty = true empty = true
dead = true dead = true
} }
@ -151,8 +159,10 @@ func Run(cmdline string) string {
} else { } else {
log.Debug("STDOUT: count = ", count) log.Debug("STDOUT: count = ", count)
io.WriteString(&bytesBuffer, string(oneByte)) io.WriteString(&bytesBuffer, string(oneByte))
f.Write(oneByte[0:count]) if (! quiet) {
f.Flush() f.Write(oneByte[0:count])
f.Flush()
}
} }
} }
@ -193,9 +203,8 @@ func Run(cmdline string) string {
// this removes the newlines at the end // this removes the newlines at the end
tmp2 := string(b) tmp2 := string(b)
tmp2 = strings.TrimSuffix(tmp2, "\n") tmp2 = strings.TrimSuffix(tmp2, "\n")
log.Println("shell.Run() END ", cmdline)
log.Println("shell.Run() calling handleError() :")
handleError(nil, 0) handleError(nil, 0)
log.Println("shell.Run() END ", cmdline)
return Chomp(b) return Chomp(b)
} }