From b52e5a4cba1b018ebb0549e7daf7644a07d1cae4 Mon Sep 17 00:00:00 2001
From: jonct <2807816+jonct@users.noreply.github.com>
Date: Mon, 15 Jul 2024 04:36:44 -0400
Subject: [PATCH] Nip and tuck; tidy and sort

---
 src/jlmkr/actions/create.py  | 5 +++--
 src/jlmkr/actions/edit.py    | 2 +-
 src/jlmkr/actions/list.py    | 3 ++-
 src/jlmkr/actions/log.py     | 2 +-
 src/jlmkr/actions/remove.py  | 2 +-
 src/jlmkr/actions/restart.py | 1 -
 src/jlmkr/actions/start.py   | 7 ++++---
 src/jlmkr/actions/startup.py | 2 +-
 src/jlmkr/actions/status.py  | 2 +-
 9 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/jlmkr/actions/create.py b/src/jlmkr/actions/create.py
index 5109d2b..af155bc 100644
--- a/src/jlmkr/actions/create.py
+++ b/src/jlmkr/actions/create.py
@@ -9,7 +9,9 @@
 from inspect import cleandoc
 from pathlib import Path, PurePath
 from textwrap import dedent
-from donor.jlmkr import DISCLAIMER
+
+from cli import DISCLAIMER
+from paths import COMMAND_NAME, JAILS_DIR_PATH, SCRIPT_NAME, SCRIPT_DIR_PATH
 from utils.chroot import Chroot
 from utils.config_parser import KeyValueParser, DEFAULT_CONFIG
 from utils.console import YELLOW, BOLD, NORMAL, eprint
@@ -18,7 +20,6 @@
 from utils.dataset import check_jail_name_valid, check_jail_name_available
 from utils.dataset import get_jail_config_path, get_jail_rootfs_path
 from utils.dataset import get_jail_path, get_zfs_dataset, create_zfs_dataset, cleanup
-from utils.paths import COMMAND_NAME, JAILS_DIR_PATH, SCRIPT_NAME, SCRIPT_DIR_PATH
 
 
 def create_jail(**kwargs):
diff --git a/src/jlmkr/actions/edit.py b/src/jlmkr/actions/edit.py
index aecd040..fe0ad07 100644
--- a/src/jlmkr/actions/edit.py
+++ b/src/jlmkr/actions/edit.py
@@ -6,9 +6,9 @@
 import subprocess
 
 from utils.console import eprint
-from utils.editor import get_text_editor
 from utils.dataset import check_jail_name_valid, check_jail_name_available
 from utils.dataset import get_jail_config_path, jail_is_running
+from utils.editor import get_text_editor
 
 
 def edit_jail(jail_name):
diff --git a/src/jlmkr/actions/list.py b/src/jlmkr/actions/list.py
index c444cc6..fd3423d 100644
--- a/src/jlmkr/actions/list.py
+++ b/src/jlmkr/actions/list.py
@@ -6,8 +6,9 @@
 import subprocess
 
 from collections import defaultdict
-from utils.console import NORMAL, UNDERLINE
+
 from utils.config_parser import parse_config_file
+from utils.console import NORMAL, UNDERLINE
 from utils.dataset import get_all_jail_names, get_jail_config_path, get_jail_rootfs_path, parse_os_release
 
 
diff --git a/src/jlmkr/actions/log.py b/src/jlmkr/actions/log.py
index b0e7b32..7f75e06 100644
--- a/src/jlmkr/actions/log.py
+++ b/src/jlmkr/actions/log.py
@@ -4,7 +4,7 @@
 
 import subprocess
 
-from utils.paths import SHORTNAME
+from paths import SHORTNAME
 
 
 def log_jail(jail_name, args):
diff --git a/src/jlmkr/actions/remove.py b/src/jlmkr/actions/remove.py
index 28588f9..3a5e691 100644
--- a/src/jlmkr/actions/remove.py
+++ b/src/jlmkr/actions/remove.py
@@ -3,9 +3,9 @@
 # SPDX-License-Identifier: LGPL-3.0-only
 
 from actions.stop import stop_jail
+from utils.console import eprint
 from utils.dataset import check_jail_name_valid, check_jail_name_available
 from utils.dataset import get_jail_path, cleanup
-from utils.console import eprint
 
 
 def remove_jail(jail_name):
diff --git a/src/jlmkr/actions/restart.py b/src/jlmkr/actions/restart.py
index 1740230..c50fbdf 100644
--- a/src/jlmkr/actions/restart.py
+++ b/src/jlmkr/actions/restart.py
@@ -2,7 +2,6 @@
 #
 # SPDX-License-Identifier: LGPL-3.0-only
 
-
 import subprocess
 import time
 
diff --git a/src/jlmkr/actions/start.py b/src/jlmkr/actions/start.py
index 790f5c2..9828ce5 100644
--- a/src/jlmkr/actions/start.py
+++ b/src/jlmkr/actions/start.py
@@ -9,13 +9,14 @@
 
 from pathlib import Path
 from textwrap import dedent
+
+from paths import SHORTNAME, JAIL_ROOTFS_NAME
 from utils.config_parser import parse_config_file
 from utils.console import eprint
+from utils.dataset import get_jail_config_path, get_jail_rootfs_path
+from utils.dataset import get_jail_path, jail_is_running
 from utils.files import stat_chmod
 from utils.gpu import passthrough_intel, passthrough_nvidia
-from utils.dataset import get_jail_path, jail_is_running
-from utils.dataset import get_jail_config_path, get_jail_rootfs_path
-from utils.paths import SHORTNAME, JAIL_ROOTFS_NAME
 
 
 def start_jail(jail_name):
diff --git a/src/jlmkr/actions/startup.py b/src/jlmkr/actions/startup.py
index 8314f8a..5df7b3d 100644
--- a/src/jlmkr/actions/startup.py
+++ b/src/jlmkr/actions/startup.py
@@ -3,8 +3,8 @@
 # SPDX-License-Identifier: LGPL-3.0-only
 
 from actions.start import start_jail
-from utils.dataset import get_all_jail_names, get_jail_config_path
 from utils.config_parser import parse_config_file
+from utils.dataset import get_all_jail_names, get_jail_config_path
 
 
 def startup_jails():
diff --git a/src/jlmkr/actions/status.py b/src/jlmkr/actions/status.py
index e3fa570..9fe54da 100644
--- a/src/jlmkr/actions/status.py
+++ b/src/jlmkr/actions/status.py
@@ -4,7 +4,7 @@
 
 import subprocess
 
-from utils.paths import SHORTNAME
+from paths import SHORTNAME
 
 
 def status_jail(jail_name, args):