@@ -86,20 +86,21 @@ func main() {
86
86
if len (* s ) > 0 {
87
87
adbargs = append (adbargs , "-s" , * s )
88
88
}
89
+ _ , suppresscolor := os .LookupEnv ("NO_COLOR" )
89
90
if len (flag .Args ()) == 0 {
90
- processLogs (func (line * logLine ) bool { return true })
91
+ processLogs (func (line * logLine ) bool { return true }, suppresscolor )
91
92
} else {
92
93
packages := make (map [string ]bool )
93
94
94
95
for _ , pkg := range os .Args {
95
96
packages [pkg ] = true
96
97
}
97
98
pids := getProcs (packages )
98
- processLogs (func (line * logLine ) bool { return filterByPackages (line , packages , pids ) })
99
+ processLogs (func (line * logLine ) bool { return filterByPackages (line , packages , pids ) }, suppresscolor )
99
100
}
100
101
}
101
102
102
- func processLogs (filter filter ) {
103
+ func processLogs (filter filter , suppresscolor bool ) {
103
104
r , w := io .Pipe ()
104
105
105
106
go runADB (w , "logcat" )
@@ -119,7 +120,11 @@ func processLogs(filter filter) {
119
120
continue
120
121
}
121
122
if filter (msg ) {
122
- fmt .Printf ("%s%s%s\n " , colorForLevel (msg .level ), line , reset )
123
+ if suppresscolor {
124
+ fmt .Printf ("%s\n " , line )
125
+ } else {
126
+ fmt .Printf ("%s%s%s\n " , colorForLevel (msg .level ), line , reset )
127
+ }
123
128
}
124
129
}
125
130
}
0 commit comments