From 11c2feae5b9070f34e142f6d2aad7ab1832e6dbd Mon Sep 17 00:00:00 2001 From: Solomon Hykes Date: Fri, 28 Mar 2014 15:37:21 -0700 Subject: [PATCH] beam/examples/beamsh: 'exec' adds 'fromcmd' field to its output Docker-DCO-1.1-Signed-off-by: Solomon Hykes (github: shykes) --- beam/examples/beamsh/beamsh.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/beam/examples/beamsh/beamsh.go b/beam/examples/beamsh/beamsh.go index e67910a..2fe8685 100644 --- a/beam/examples/beamsh/beamsh.go +++ b/beam/examples/beamsh/beamsh.go @@ -634,8 +634,8 @@ func GetHandler(name string) Handler { } cmd.Stderr = errW cmd.Stdin = os.Stdin - beam.Send(out, data.Empty().Set("cmd", "log", "stdout").Bytes(), outR) - beam.Send(out, data.Empty().Set("cmd", "log", "stderr").Bytes(), errR) + beam.Send(out, data.Empty().Set("cmd", "log", "stdout").Set("fromcmd", args...).Bytes(), outR) + beam.Send(out, data.Empty().Set("cmd", "log", "stderr").Set("fromcmd", args...).Bytes(), errR) execErr := cmd.Run() var status string if execErr != nil {