From e4a7f68b0ed3fe332de41e423c33051aa3f2c09d Mon Sep 17 00:00:00 2001
From: Qubasa <consulting@qube.email>
Date: Tue, 2 Jan 2024 16:53:01 +0100
Subject: [PATCH] Fixed cmd.py writing to stderr

---
 pkgs/clan-cli/clan_cli/cmd.py | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/clan-cli/clan_cli/cmd.py b/pkgs/clan-cli/clan_cli/cmd.py
index 96b56c8b1..61d1efa16 100644
--- a/pkgs/clan-cli/clan_cli/cmd.py
+++ b/pkgs/clan-cli/clan_cli/cmd.py
@@ -24,25 +24,27 @@ def run(cmd: list[str], cwd: Path = Path.cwd()) -> CmdOut:
     )
 
     # Initialize empty strings for output and error
-    output = ""
-    error = ""
+    output = b""
+    error = b""
 
     # Iterate over the stdout stream
     for c in iter(lambda: process.stdout.read(1), b""):  # type: ignore
         # Convert bytes to string and append to output
-        output += c.decode("utf-8")
+        output += c
         # Write to terminal
-        sys.stdout.write(c.decode("utf-8"))
-
+        sys.stdout.buffer.write(c)
     # Iterate over the stderr stream
     for c in iter(lambda: process.stderr.read(1), b""):  # type: ignore
         # Convert bytes to string and append to error
-        error += c.decode("utf-8")
+        error += c
         # Write to terminal
-        sys.stderr.write(c.decode("utf-8"))
+        sys.stderr.buffer.write(c)
     # Wait for the subprocess to finish
     process.wait()
 
+    output_str = output.decode("utf-8")
+    error_str = error.decode("utf-8")
+
     if process.returncode != 0:
         raise ClanError(
             f"""
@@ -50,12 +52,12 @@ command: {shlex.join(cmd)}
 working directory: {cwd}
 exit code: {process.returncode}
 stderr:
-{error}
+{error_str}
 stdout:
-{output}
+{output_str}
 """
         )
-    return CmdOut(output, error, cwd=cwd)
+    return CmdOut(output_str, error_str, cwd=cwd)
 
 
 def runforcli(func: Callable[..., dict[str, CmdOut]], *args: Any) -> None: