From ada77b3a3b3d1109d960b3f31121c9d0903874d5 Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Wed, 6 Dec 2023 15:32:08 -0700
Subject: [PATCH] Wait on stream redirect futures (update helper task)

---
 build.gradle.kts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 0b8b21a5fa..5d4dae473e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -207,9 +207,10 @@ abstract class RebasePatches : BaseTask() {
             .redirectErrorStream(true)
             .start()
 
-        redirect(proc.inputStream, out)
+        val f = redirect(proc.inputStream, out)
 
         val exit = proc.waitFor()
+        f.get()
 
         if (exit != 0) {
             val outStr = String(out.toByteArray())
@@ -251,8 +252,9 @@ abstract class RebasePatches : BaseTask() {
                 .redirectErrorStream(true)
                 .start()
 
-            redirect(apply2.inputStream, System.out)
+            val f1 = redirect(apply2.inputStream, System.out)
             apply2.waitFor()
+            f1.get()
 
             logger.lifecycle(outStr)
             logger.lifecycle("Patch failed at $failed; See Git output above.")