Merge pull request #5508 from pucheGit/douga-termstyledetection

tstromberg · web-flow · commit db4ef8c714a7 · 2019-10-09T11:30:44.000-07:00
Adjusted Terminal Style Detection
diff --git a/pkg/minikube/out/out.go b/pkg/minikube/out/out.go
@@ -161,9 +161,10 @@ func wantsColor(fd uintptr) bool {
 	}
 
 	term := os.Getenv("TERM")
+	colorTerm := os.Getenv("COLORTERM")
 	// Example: term-256color
-	if !strings.Contains(term, "color") {
-		glog.Infof("TERM=%s, which probably does not support color", term)
+	if !strings.Contains(term, "color") && !strings.Contains(colorTerm, "truecolor") && !strings.Contains(colorTerm, "24bit") && !strings.Contains(colorTerm, "yes") {
+		glog.Infof("TERM=%s,COLORTERM=%s, which probably does not support color", term, colorTerm)
 		return false
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -161,9 +161,10 @@ func wantsColor(fd uintptr) bool {`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`term := os.Getenv("TERM")`
	`164`	`+ colorTerm := os.Getenv("COLORTERM")`
`164`	`165`	`// Example: term-256color`
`165`		`- if !strings.Contains(term, "color") {`
`166`		`- glog.Infof("TERM=%s, which probably does not support color", term)`
	`166`	`+ if !strings.Contains(term, "color") && !strings.Contains(colorTerm, "truecolor") && !strings.Contains(colorTerm, "24bit") && !strings.Contains(colorTerm, "yes") {`
	`167`	`+ glog.Infof("TERM=%s,COLORTERM=%s, which probably does not support color", term, colorTerm)`
`167`	`168`	`return false`
`168`	`169`	`}`
`169`	`170`