From 0c1d4a1d4102e4ff03530a6d3446c7e40d98934f Mon Sep 17 00:00:00 2001
From: Qubasa <consulting@qube.email>
Date: Fri, 12 Jan 2024 17:21:48 +0100
Subject: [PATCH] cmd.py refactor part 6

---
 pkgs/clan-cli/clan_cli/ssh/cli.py | 32 ++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/pkgs/clan-cli/clan_cli/ssh/cli.py b/pkgs/clan-cli/clan_cli/ssh/cli.py
index 4c311268..fe97d608 100644
--- a/pkgs/clan-cli/clan_cli/ssh/cli.py
+++ b/pkgs/clan-cli/clan_cli/ssh/cli.py
@@ -1,7 +1,7 @@
 import argparse
 import json
+import subprocess
 
-from ..cmd import Log, run
 from ..nix import nix_shell
 
 
@@ -30,21 +30,27 @@ def ssh(
         f"{user}@{host}",
     ]
     cmd = nix_shell(packages, ["torify", *password_args, *_ssh_args])
-    run(cmd, log=Log.BOTH)
+    subprocess.run(cmd)
 
 
 def qrcode_scan(picture_file: str) -> str:
-    return run(
-        nix_shell(
-            ["nixpkgs#zbar"],
-            [
-                "zbarimg",
-                "--quiet",
-                "--raw",
-                picture_file,
-            ],
-        ),
-    ).stdout.strip()
+    return (
+        subprocess.run(
+            nix_shell(
+                ["nixpkgs#zbar"],
+                [
+                    "zbarimg",
+                    "--quiet",
+                    "--raw",
+                    picture_file,
+                ],
+            ),
+            stdout=subprocess.PIPE,
+            check=True,
+        )
+        .stdout.decode()
+        .strip()
+    )
 
 
 def main(args: argparse.Namespace) -> None: