Merge pull request #108 from compnerd/windows-terminal

neonichu · web-flow · commit a3e5bb8967dc · 2020-08-12T10:56:25.000-07:00
TSCBasic: use the "portable" names for `terminalType`
diff --git a/Sources/TSCBasic/TerminalController.swift b/Sources/TSCBasic/TerminalController.swift
@@ -109,11 +109,15 @@ public final class TerminalController {
 
     /// Computes the terminal type of the stream.
     public static func terminalType(_ stream: LocalFileOutputByteStream) -> TerminalType {
+#if os(Windows)
+        return _isatty(_fileno(stream.filePointer)) == 0 ? .file : .tty
+#else
         if ProcessEnv.vars["TERM"] == "dumb" {
             return .dumb
         }
         let isTTY = isatty(fileno(stream.filePointer)) != 0
         return isTTY ? .tty : .file
+#endif
     }
 
     /// Tries to get the terminal width first using COLUMNS env variable and

Original file line number	Diff line number	Diff line change
`@@ -109,11 +109,15 @@ public final class TerminalController {`
`109`	`109`
`110`	`110`	`/// Computes the terminal type of the stream.`
`111`	`111`	`public static func terminalType(_ stream: LocalFileOutputByteStream) -> TerminalType {`
	`112`	`+#if os(Windows)`
	`113`	`+ return _isatty(_fileno(stream.filePointer)) == 0 ? .file : .tty`
	`114`	`+#else`
`112`	`115`	`if ProcessEnv.vars["TERM"] == "dumb" {`
`113`	`116`	`return .dumb`
`114`	`117`	`}`
`115`	`118`	`let isTTY = isatty(fileno(stream.filePointer)) != 0`
`116`	`119`	`return isTTY ? .tty : .file`
	`120`	`+#endif`
`117`	`121`	`}`
`118`	`122`
`119`	`123`	`/// Tries to get the terminal width first using COLUMNS env variable and`