diff --git a/kiauh/components/octoeverywhere/__init__.py b/kiauh/components/octoeverywhere/__init__.py index f07e4ab..ac8b838 100644 --- a/kiauh/components/octoeverywhere/__init__.py +++ b/kiauh/components/octoeverywhere/__init__.py @@ -20,8 +20,6 @@ OE_STORE_DIR = OE_DIR.joinpath("octoeverywhere-store") OE_REQ_FILE = OE_DIR.joinpath("requirements.txt") OE_DEPS_JSON_FILE = OE_DIR.joinpath("moonraker-system-dependencies.json") OE_INSTALL_SCRIPT = OE_DIR.joinpath("install.sh") -OE_UPDATE_SCRIPT = OE_DIR.joinpath("update.sh") -OE_REMOVE_SCRIPT = OE_DIR.joinpath("uninstall.sh") # filenames OE_CFG_NAME = "octoeverywhere.conf" diff --git a/kiauh/components/octoeverywhere/octoeverywhere.py b/kiauh/components/octoeverywhere/octoeverywhere.py index 29b3c29..41ef3f8 100644 --- a/kiauh/components/octoeverywhere/octoeverywhere.py +++ b/kiauh/components/octoeverywhere/octoeverywhere.py @@ -23,10 +23,7 @@ from components.octoeverywhere import ( from core.instance_manager.base_instance import BaseInstance from utils.logger import Logger -MODULE_PATH = Path(__file__).resolve().parent - -# noinspection PyMethodMayBeStatic class Octoeverywhere(BaseInstance): @classmethod def blacklist(cls) -> List[str]: @@ -45,6 +42,10 @@ class Octoeverywhere(BaseInstance): def cfg_file(self) -> Path: return self._cfg_file + @property + def sys_cfg_file(self) -> Path: + return self._sys_cfg_file + @property def log(self) -> Path: return self._log @@ -54,7 +55,6 @@ class Octoeverywhere(BaseInstance): try: cmd = f"{OE_INSTALL_SCRIPT} {self.cfg_dir}/moonraker.conf" - print(cmd) run(cmd, check=True, shell=True) except CalledProcessError as e: diff --git a/kiauh/components/octoeverywhere/octoeverywhere_setup.py b/kiauh/components/octoeverywhere/octoeverywhere_setup.py index 366ef71..8f28f18 100644 --- a/kiauh/components/octoeverywhere/octoeverywhere_setup.py +++ b/kiauh/components/octoeverywhere/octoeverywhere_setup.py @@ -64,6 +64,8 @@ def install_octoeverywhere() -> None: "It is save to run the installer again to link your " "printer or repair any issues.", ], + padding_top=0, + padding_bottom=0, ) if not get_confirm("Re-run OctoEverywhere installation?"): Logger.print_info("Exiting OctoEverywhere for Klipper installation ...") @@ -84,6 +86,8 @@ def install_octoeverywhere() -> None: "\n\n", "The setup will apply the same names to OctoEverywhere!", ], + padding_top=0, + padding_bottom=0, ) if not get_confirm(