@@ -3,6 +3,7 @@ package cmd
33import (
44"context"
55"fmt"
6+ "os"
67"strings"
78"time"
89
@@ -12,6 +13,7 @@ import (
1213"github.com/manifoldco/promptui"
1314"github.com/spf13/cobra"
1415"go.coder.com/flog"
16+ "golang.org/x/crypto/ssh/terminal"
1517"golang.org/x/xerrors"
1618)
1719
@@ -74,6 +76,9 @@ func trailBuildLogs(ctx context.Context, client *coder.Client, envID string) err
7476
7577newSpinner := func ()* spinner.Spinner {return spinner .New (spinner .CharSets [11 ],100 * time .Millisecond ) }
7678
79+ // this tells us whether to show dynamic loaders when printing output
80+ isTerminal := terminal .IsTerminal (int (os .Stdout .Fd ()))
81+
7782logs ,err := client .FollowEnvironmentBuildLog (ctx ,envID )
7883if err != nil {
7984return err
@@ -88,23 +93,32 @@ func trailBuildLogs(ctx context.Context, client *coder.Client, envID string) err
8893// the FE uses this to reset the UI
8994// the CLI doesn't need to do anything here given that we only append to the trail
9095case coder .BuildLogTypeStage :
96+ msg := fmt .Sprintf ("%s %s" ,l .BuildLog .Time .Format (time .RFC3339 ),l .BuildLog .Msg )
97+ if ! isTerminal {
98+ fmt .Println (msg )
99+ continue
100+ }
91101if s != nil {
92102s .Stop ()
93103fmt .Print ("\n " )
94104}
95105s = newSpinner ()
96- msg := fmt .Sprintf ("%s %s" ,l .BuildLog .Time .Format (time .RFC3339 ),l .BuildLog .Msg )
97106s .Suffix = fmt .Sprintf (" -- %s" ,msg )
98107s .FinalMSG = fmt .Sprintf ("%s -- %s" ,check ,msg )
99108s .Start ()
100109case coder .BuildLogTypeSubstage :
101110// TODO(@cmoog) add verbose substage printing
102111case coder .BuildLogTypeError :
112+ errMsg := color .RedString ("\t %s" ,l .BuildLog .Msg )
113+ if ! isTerminal {
114+ fmt .Println (errMsg )
115+ continue
116+ }
103117if s != nil {
104118s .FinalMSG = fmt .Sprintf ("%s %s" ,failure ,strings .TrimPrefix (s .Suffix ," " ))
105119s .Stop ()
106120}
107- fmt .Print (color . RedString ( " \t %s" , l . BuildLog . Msg ) )
121+ fmt .Print (errMsg )
108122s = newSpinner ()
109123case coder .BuildLogTypeDone :
110124if s != nil {