Merge remote-tracking branch 'origin/master'

# Conflicts: # tools/orphan_images/orphimg.kt
holgerbrandl · Apr 22, 2021 · bb71d14 · bb71d14
2 parents acb296d + f0cbf36
commit bb71d14
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 83 deletions.
diff --git a/src/main/kotlin/de/mpicbg/scicomp/kutils/Bash.kt b/src/main/kotlin/de/mpicbg/scicomp/kutils/Bash.kt
@@ -11,21 +11,23 @@ data class BashResult(val exitCode: Int, val stdout: Iterable<String>, val stder
 }
 
 
-fun evalBash(cmd: String, showOutput: Boolean = false,
-             redirectStdout: File? = null, redirectStderr: File? = null, wd: File? = null): BashResult {
+fun evalBash(cmd: String, showOutput: Boolean = false, wd: File? = null): BashResult {
 
     try {
 
         // optionally prefix script with working directory change
         val cmd = (if (wd != null) "cd '${wd.absolutePath}'\n" else "") + cmd
 
 
-        var pb = ProcessBuilder("/bin/bash", "-c", cmd) //.inheritIO();
+        var pb = ProcessBuilder("/bin/bash", "-c", cmd)
+        if (showOutput) {
+            pb.inheritIO()
+        }        
         pb.directory(File("."));
         var p = pb.start();
 
-        val outputGobbler = StreamGobbler(p.getInputStream(), if (showOutput) System.out else null)
-        val errorGobbler = StreamGobbler(p.getErrorStream(), if (showOutput) System.err else null)
+        val outputGobbler = StreamGobbler(p.getInputStream())
+        val errorGobbler = StreamGobbler(p.getErrorStream())
 
         // kick them off
         errorGobbler.start()
@@ -40,7 +42,7 @@ fun evalBash(cmd: String, showOutput: Boolean = false,
 }
 
 
-internal class StreamGobbler(var inStream: InputStream, val printStream: PrintStream?) : Thread() {
+internal class StreamGobbler(var inStream: InputStream) : Thread() {
     var sb = StringBuilder()
 
     override fun run() {
@@ -49,7 +51,6 @@ internal class StreamGobbler(var inStream: InputStream, val printStream: PrintSt
             val br = BufferedReader(isr)
             for (line in br.linesJ7()) {
                 sb.append(line!! + "\n")
-                printStream?.println(line)
             }
         } catch (ioe: IOException) {
             ioe.printStackTrace()

diff --git a/tools/orphan_images/README.md b/tools/orphan_images/README.md
diff --git a/tools/orphan_images/orphimg.kt b/tools/orphan_images/orphimg.kt