From 596614e0d326d96a8bb451d3aeb38b3e52534c6d Mon Sep 17 00:00:00 2001
From: Ryan Ward <ryan.ward@samsung.com>
Date: Wed, 26 Aug 2026 12:12:09 -0500
Subject: [PATCH] Updating install and deploy commands for new potential way of
 distribution

---
 script/build-and-deploy-hermes/src/index.tsx  | 35 +++++++++++++------
 .../src/index.tsx                             | 35 +++++++++++++------
 2 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/script/build-and-deploy-hermes/src/index.tsx b/script/build-and-deploy-hermes/src/index.tsx
index 9852b529..22e0662a 100644
--- a/script/build-and-deploy-hermes/src/index.tsx
+++ b/script/build-and-deploy-hermes/src/index.tsx
@@ -52,21 +52,34 @@ function runCommandStreaming(
       stdio: ["ignore", "pipe", "pipe"],
     });
 
-    let leftover = "";
-    const processChunk = (chunk: Buffer) => {
-      const text = leftover + chunk.toString();
-      const lines = text.split("\n");
-      leftover = lines.pop() || "";
-      for (const line of lines) {
-        if (line.trim()) onLog(line);
-      }
+    const createChunkProcessor = () => {
+      let leftover = "";
+      return {
+        process(chunk: Buffer) {
+          const text = leftover + chunk.toString();
+          // Cargo renders progress with carriage returns when attached to a terminal. Treat both
+          // carriage returns and newlines as line boundaries so build output appears live in Ink.
+          const lines = text.split(/\r\n|\r|\n/);
+          leftover = lines.pop() || "";
+          for (const line of lines) {
+            if (line.trim()) onLog(line);
+          }
+        },
+        flush() {
+          if (leftover.trim()) onLog(leftover);
+          leftover = "";
+        },
+      };
     };
+    const stdout = createChunkProcessor();
+    const stderr = createChunkProcessor();
 
-    child.stdout?.on("data", processChunk);
-    child.stderr?.on("data", processChunk);
+    child.stdout?.on("data", (chunk: Buffer) => stdout.process(chunk));
+    child.stderr?.on("data", (chunk: Buffer) => stderr.process(chunk));
 
     child.on("close", (code) => {
-      if (leftover.trim()) onLog(leftover);
+      stdout.flush();
+      stderr.flush();
       if (code === 0) resolve();
       else reject(new Error(`Command failed with exit code ${code}`));
     });
diff --git a/script/build-and-install-to-applications/src/index.tsx b/script/build-and-install-to-applications/src/index.tsx
index d10bf0ee..c5f4057b 100644
--- a/script/build-and-install-to-applications/src/index.tsx
+++ b/script/build-and-install-to-applications/src/index.tsx
@@ -36,21 +36,34 @@ function runCommandStreaming(
       stdio: ["ignore", "pipe", "pipe"],
     });
 
-    let leftover = "";
-    const processChunk = (chunk: Buffer) => {
-      const text = leftover + chunk.toString();
-      const lines = text.split("\n");
-      leftover = lines.pop() || "";
-      for (const line of lines) {
-        if (line.trim()) onLog(line);
-      }
+    const createChunkProcessor = () => {
+      let leftover = "";
+      return {
+        process(chunk: Buffer) {
+          const text = leftover + chunk.toString();
+          // Cargo renders progress with carriage returns when attached to a terminal. Treat both
+          // carriage returns and newlines as line boundaries so build output appears live in Ink.
+          const lines = text.split(/\r\n|\r|\n/);
+          leftover = lines.pop() || "";
+          for (const line of lines) {
+            if (line.trim()) onLog(line);
+          }
+        },
+        flush() {
+          if (leftover.trim()) onLog(leftover);
+          leftover = "";
+        },
+      };
     };
+    const stdout = createChunkProcessor();
+    const stderr = createChunkProcessor();
 
-    child.stdout?.on("data", processChunk);
-    child.stderr?.on("data", processChunk);
+    child.stdout?.on("data", (chunk: Buffer) => stdout.process(chunk));
+    child.stderr?.on("data", (chunk: Buffer) => stderr.process(chunk));
 
     child.on("close", (code) => {
-      if (leftover.trim()) onLog(leftover);
+      stdout.flush();
+      stderr.flush();
       if (code === 0) resolve();
       else reject(new Error(`Command failed with exit code ${code}`));
     });