mypy/deb,fs,grub

rwx/deb/__init__.py

@@ -1,8 +1,6 @@
 """Wrap Debian commands."""
 
-import cmd
+from rwx import cmd, ps
-
-from rwx import ps
 
 cmd.need("debootstrap")
 
@@ -20,4 +18,4 @@ def bootstrap(root_path: str, suite: str, mirror_location: str) -> None:
         (root_path,),
         (mirror_location,),
     ]
-    return ps.run(command)
+    ps.run(*command)

rwx/fs/__init__.py

@@ -14,7 +14,7 @@ def create_image(file_path: str, size_bytes: int) -> None:
     ps.run(
         ("qemu-img", "create"),
         ("-f", "qcow2"),
-        (file_path, size_bytes),
+        (file_path, str(size_bytes)),
     )
 
 
@@ -36,9 +36,9 @@ def get_mount_uuid(path: str) -> str:
 def get_path_mount(path: str) -> str:
     """Return the mountpoint path of an arbitrary path."""
     return ps.run_line(
-        ("stat",),
+        "stat",
         ("--format", "%m"),
-        (path,),
+        path,
     )
 
 

rwx/grub/__init__.py

@@ -1,8 +1,6 @@
 """Wrap GRUB commands."""
 
-import cmd
+from rwx import cmd, ps
-
-from rwx import ps
 
 cmd.need("grub-mkimage")