Windows fix

zakstucke · Jan 26, 2024 · b6600ee · b6600ee
1 parent 75c7cea
commit b6600ee
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/rust/bitbazaar/cli/bash.rs b/rust/bitbazaar/cli/bash.rs
@@ -63,10 +63,19 @@ pub struct Shell {
 
 impl From<Shell> for CmdOut {
     fn from(val: Shell) -> Self {
-        CmdOut {
-            stdout: val.stdout,
-            stderr: val.stderr,
-            code: val.code,
+        if cfg!(windows) {
+            // Remove carriage returns from newlines in windows:
+            CmdOut {
+                stdout: val.stdout.replace("\r\n", "\n"),
+                stderr: val.stderr.replace("\r\n", "\n"),
+                code: val.code,
+            }
+        } else {
+            CmdOut {
+                stdout: val.stdout,
+                stderr: val.stderr,
+                code: val.code,
+            }
         }
     }
 }