From 3d7881328fb67b3e6ae0f174c288efb6d6ca6f63 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Wed, 6 Apr 2022 19:06:32 -0600 Subject: [PATCH] Move ddrescue out of wk/hw section --- scripts/ddrescue-tui.py | 4 ++-- scripts/wk/__init__.py | 1 + scripts/wk/clone/__init__.py | 3 +++ scripts/wk/{hw => clone}/ddrescue.py | 0 scripts/wk/hw/__init__.py | 1 - 5 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 scripts/wk/clone/__init__.py rename scripts/wk/{hw => clone}/ddrescue.py (100%) diff --git a/scripts/ddrescue-tui.py b/scripts/ddrescue-tui.py index 2857053c..bd383ac5 100755 --- a/scripts/ddrescue-tui.py +++ b/scripts/ddrescue-tui.py @@ -10,14 +10,14 @@ import wk if __name__ == '__main__': try: - docopt(wk.hw.ddrescue.DOCSTRING) + docopt(wk.clone.ddrescue.DOCSTRING) except SystemExit: print('') wk.std.pause('Press Enter to exit...') raise try: - wk.hw.ddrescue.main() + wk.clone.ddrescue.main() except SystemExit: raise except: #pylint: disable=bare-except diff --git a/scripts/wk/__init__.py b/scripts/wk/__init__.py index 51521ea3..e6877c23 100644 --- a/scripts/wk/__init__.py +++ b/scripts/wk/__init__.py @@ -4,6 +4,7 @@ from sys import version_info as version from . import cfg +from . import clone from . import debug from . import exe from . import graph diff --git a/scripts/wk/clone/__init__.py b/scripts/wk/clone/__init__.py new file mode 100644 index 00000000..43ffabbc --- /dev/null +++ b/scripts/wk/clone/__init__.py @@ -0,0 +1,3 @@ +"""WizardKit: ddrescue-tui module init""" + +from . import ddrescue diff --git a/scripts/wk/hw/ddrescue.py b/scripts/wk/clone/ddrescue.py similarity index 100% rename from scripts/wk/hw/ddrescue.py rename to scripts/wk/clone/ddrescue.py diff --git a/scripts/wk/hw/__init__.py b/scripts/wk/hw/__init__.py index fca26622..fd8daedb 100644 --- a/scripts/wk/hw/__init__.py +++ b/scripts/wk/hw/__init__.py @@ -3,7 +3,6 @@ from . import audio from . import benchmark from . import cpu -from . import ddrescue from . import diags from . import disk from . import keyboard