From be8e5aa3071d9bc5d0bd24647e8168f312d11c8d Mon Sep 17 00:00:00 2001
From: Lucas Fernandes Nogueira <lucas@tauri.app>
Date: Wed, 18 Oct 2023 12:29:12 -0300
Subject: [PATCH] fix(cli): duplicated newlines on child process output (#8042)

---
 .changes/fix-cmd-output.md                |  7 +++++++
 examples/api/src-tauri/Cargo.lock         |  2 +-
 tooling/bundler/src/bundle/common.rs      | 24 +++++++++++------------
 tooling/cli/src/interface/rust/desktop.rs |  3 ---
 tooling/cli/src/lib.rs                    | 23 +++++++++++-----------
 5 files changed, 30 insertions(+), 29 deletions(-)
 create mode 100644 .changes/fix-cmd-output.md

diff --git a/.changes/fix-cmd-output.md b/.changes/fix-cmd-output.md
new file mode 100644
index 000000000..53176bb07
--- /dev/null
+++ b/.changes/fix-cmd-output.md
@@ -0,0 +1,7 @@
+---
+"@tauri-apps/cli": patch:bug
+"tauri-cli": patch:bug
+"tauri-bundler": patch:bug
+---
+
+Fixes duplicated newlines on command outputs.
diff --git a/examples/api/src-tauri/Cargo.lock b/examples/api/src-tauri/Cargo.lock
index 80d411a36..96070ddbe 100644
--- a/examples/api/src-tauri/Cargo.lock
+++ b/examples/api/src-tauri/Cargo.lock
@@ -3529,7 +3529,7 @@ checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5"
 
 [[package]]
 name = "tauri"
-version = "1.5.1"
+version = "1.5.2"
 dependencies = [
  "anyhow",
  "base64 0.21.2",
diff --git a/tooling/bundler/src/bundle/common.rs b/tooling/bundler/src/bundle/common.rs
index 4269825df..712e3ebc9 100644
--- a/tooling/bundler/src/bundle/common.rs
+++ b/tooling/bundler/src/bundle/common.rs
@@ -8,7 +8,7 @@ use log::debug;
 use std::{
   ffi::OsStr,
   fs::{self, File},
-  io::{self, BufReader, BufWriter},
+  io::{self, BufRead, BufReader, BufWriter},
   path::Path,
   process::{Command, ExitStatus, Output, Stdio},
   sync::{Arc, Mutex},
@@ -165,16 +165,15 @@ impl CommandExt for Command {
     let stdout_lines = Arc::new(Mutex::new(Vec::new()));
     let stdout_lines_ = stdout_lines.clone();
     std::thread::spawn(move || {
-      let mut buf = Vec::new();
+      let mut line = String::new();
       let mut lines = stdout_lines_.lock().unwrap();
       loop {
-        buf.clear();
-        if let Ok(0) = tauri_utils::io::read_line(&mut stdout, &mut buf) {
+        line.clear();
+        if let Ok(0) = stdout.read_line(&mut line) {
           break;
         }
-        debug!(action = "stdout"; "{}", String::from_utf8_lossy(&buf));
-        lines.extend(buf.clone());
-        lines.push(b'\n');
+        debug!(action = "stdout"; "{}", &line[0..line.len() - 1]);
+        lines.extend(line.as_bytes().to_vec());
       }
     });
 
@@ -182,16 +181,15 @@ impl CommandExt for Command {
     let stderr_lines = Arc::new(Mutex::new(Vec::new()));
     let stderr_lines_ = stderr_lines.clone();
     std::thread::spawn(move || {
-      let mut buf = Vec::new();
+      let mut line = String::new();
       let mut lines = stderr_lines_.lock().unwrap();
       loop {
-        buf.clear();
-        if let Ok(0) = tauri_utils::io::read_line(&mut stderr, &mut buf) {
+        line.clear();
+        if let Ok(0) = stderr.read_line(&mut line) {
           break;
         }
-        debug!(action = "stderr"; "{}", String::from_utf8_lossy(&buf));
-        lines.extend(buf.clone());
-        lines.push(b'\n');
+        debug!(action = "stderr"; "{}", &line[0..line.len() - 1]);
+        lines.extend(line.as_bytes().to_vec());
       }
     });
 
diff --git a/tooling/cli/src/interface/rust/desktop.rs b/tooling/cli/src/interface/rust/desktop.rs
index dc6771e6b..a938acd15 100644
--- a/tooling/cli/src/interface/rust/desktop.rs
+++ b/tooling/cli/src/interface/rust/desktop.rs
@@ -207,9 +207,6 @@ fn build_dev_app<F: FnOnce(ExitStatus, ExitReason) + Send + 'static>(
         break;
       }
       let _ = io_stderr.write_all(&buf);
-      if !buf.ends_with(&[b'\r']) {
-        let _ = io_stderr.write_all(b"\n");
-      }
       lines.push(String::from_utf8_lossy(&buf).into_owned());
     }
   });
diff --git a/tooling/cli/src/lib.rs b/tooling/cli/src/lib.rs
index faf416d2d..801033356 100644
--- a/tooling/cli/src/lib.rs
+++ b/tooling/cli/src/lib.rs
@@ -24,6 +24,7 @@ use std::io::{BufReader, Write};
 use std::process::{exit, Command, ExitStatus, Output, Stdio};
 use std::{
   ffi::OsString,
+  io::BufRead,
   sync::{Arc, Mutex},
 };
 
@@ -226,16 +227,15 @@ impl CommandExt for Command {
     let stdout_lines = Arc::new(Mutex::new(Vec::new()));
     let stdout_lines_ = stdout_lines.clone();
     std::thread::spawn(move || {
-      let mut buf = Vec::new();
+      let mut line = String::new();
       let mut lines = stdout_lines_.lock().unwrap();
       loop {
-        buf.clear();
-        if let Ok(0) = tauri_utils::io::read_line(&mut stdout, &mut buf) {
+        line.clear();
+        if let Ok(0) = stdout.read_line(&mut line) {
           break;
         }
-        debug!(action = "stdout"; "{}", String::from_utf8_lossy(&buf));
-        lines.extend(buf.clone());
-        lines.push(b'\n');
+        debug!(action = "stdout"; "{}", &line[0..line.len() - 1]);
+        lines.extend(line.as_bytes().to_vec());
       }
     });
 
@@ -243,16 +243,15 @@ impl CommandExt for Command {
     let stderr_lines = Arc::new(Mutex::new(Vec::new()));
     let stderr_lines_ = stderr_lines.clone();
     std::thread::spawn(move || {
-      let mut buf = Vec::new();
+      let mut line = String::new();
       let mut lines = stderr_lines_.lock().unwrap();
       loop {
-        buf.clear();
-        if let Ok(0) = tauri_utils::io::read_line(&mut stderr, &mut buf) {
+        line.clear();
+        if let Ok(0) = stderr.read_line(&mut line) {
           break;
         }
-        debug!(action = "stderr"; "{}", String::from_utf8_lossy(&buf));
-        lines.extend(buf.clone());
-        lines.push(b'\n');
+        debug!(action = "stderr"; "{}", &line[0..line.len() - 1]);
+        lines.extend(line.as_bytes().to_vec());
       }
     });