fix dynamic table output when not on tty

go-jira · Aug 31, 2017 · 3942f6f · 3942f6f
1 parent da9a2b2
commit 3942f6f
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/jiracli/templates.go b/jiracli/templates.go
@@ -9,6 +9,7 @@ import (
 	"os"
 	"path/filepath"
 	"reflect"
+	"strconv"
 	"strings"
 	"syscall"
 	"text/template"
@@ -69,10 +70,16 @@ func TemplateProcessor() *template.Template {
 		},
 		"termWidth": func() int {
 			w, _, err := terminal.GetSize(syscall.Stdout)
-			if err != nil {
-				return 80
+			if err == nil {
+				return w
+			}
+			if os.Getenv("COLUMNS") != "" {
+				w, err = strconv.Atoi(os.Getenv("COLUMNS"))
+			}
+			if err == nil {
+				return w
 			}
-			return w
+			return 120
 		},
 		"sub": func(a, b int) int {
 			return a - b