Redirect output on Windows. (#18)

gojuno · May 16, 2018 · 3bc85a0 · 3bc85a0
1 parent 51b191b
commit 3bc85a0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/android/src/main/kotlin/com/gojuno/commander/android/Adb.kt b/android/src/main/kotlin/com/gojuno/commander/android/Adb.kt
@@ -42,7 +42,7 @@ fun connectedAdbDevices(): Observable<Set<AdbDevice>> = process(listOf(adb, "dev
         .retry { retryCount, exception ->
             val shouldRetry = retryCount < 5 && exception is IllegalStateException
             if (shouldRetry) {
-                log("runningEmulators: retrying $exception.")
+                log("connectedAdbDevices: retrying $exception.")
             }
 
             shouldRetry

diff --git a/.../com/gojuno/commander/android/Emulator.kt → ...com/gojuno/commander/android/AdbDevice.kt b/.../com/gojuno/commander/android/Emulator.kt → ...com/gojuno/commander/android/AdbDevice.kt
diff --git a/os/src/main/kotlin/com/gojuno/commander/os/Processes.kt b/os/src/main/kotlin/com/gojuno/commander/os/Processes.kt
@@ -63,8 +63,10 @@ fun process(
             val process: Process = ProcessBuilder(command)
                     .redirectErrorStream(true)
                     .let {
-                        when (unbufferedOutput) {
-                            true -> it.redirectOutput(os().nullDeviceFile())
+                        when {
+                            unbufferedOutput && os() !== Windows -> {
+                                it.redirectOutput(os().nullDeviceFile())
+                            }
                             else -> it.redirectOutput(ProcessBuilder.Redirect.to(outputFile))
                         }
                     }
@@ -127,12 +129,12 @@ enum class Os {
 internal fun os(): Os {
     val os = System.getProperty("os.name", "unknown").toLowerCase(Locale.ENGLISH)
 
-    if (os.contains("mac") || os.contains("darwin")) {
-        return Mac
+    return if (os.contains("mac") || os.contains("darwin")) {
+        Mac
     } else if (os.contains("linux")) {
-        return Linux
+        Linux
     } else if (os.contains("windows")) {
-        return Windows
+        Windows
     } else {
         throw IllegalStateException("Unsupported os $os, only ${Os.values()} are supported.")
     }