diff options
| -rw-r--r-- | ui/terminal/status.go | 4 | ||||
| -rw-r--r-- | ui/terminal/writer.go | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/ui/terminal/status.go b/ui/terminal/status.go index 5719456f..c8eb382f 100644 --- a/ui/terminal/status.go +++ b/ui/terminal/status.go @@ -45,7 +45,9 @@ func NewStatusOutput(w Writer, statusFormat string) status.StatusOutput { } func (s *statusOutput) Message(level status.MsgLevel, message string) { - if level > status.StatusLvl { + if level >= status.ErrorLvl { + s.writer.Print(fmt.Sprintf("FAILED: %s", message)) + } else if level > status.StatusLvl { s.writer.Print(fmt.Sprintf("%s%s", level.Prefix(), message)) } else if level == status.StatusLvl { s.writer.StatusLine(message) diff --git a/ui/terminal/writer.go b/ui/terminal/writer.go index dd322268..351c00c1 100644 --- a/ui/terminal/writer.go +++ b/ui/terminal/writer.go @@ -81,8 +81,8 @@ func NewWriter(stdio StdioInterface) Writer { } if term, ok := os.LookupEnv("TERM"); ok && term != "dumb" { - w.stripEscapes = !isTerminal(stdio.Stderr()) - w.smartTerminal = isTerminal(stdio.Stdout()) && !w.stripEscapes + w.smartTerminal = isTerminal(stdio.Stdout()) + w.stripEscapes = !w.smartTerminal } return w @@ -127,9 +127,9 @@ func (w *writerImpl) print(str string) { fmt.Fprint(w.stdio.Stdout(), "\r", "\x1b[K") w.haveBlankLine = true } - fmt.Fprint(w.stdio.Stderr(), str) + fmt.Fprint(w.stdio.Stdout(), str) if len(str) == 0 || str[len(str)-1] != '\n' { - fmt.Fprint(w.stdio.Stderr(), "\n") + fmt.Fprint(w.stdio.Stdout(), "\n") } } |