From 7dfd399e6e6e4d599837ef58f70acba2aa583a5d Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Mon, 13 Sep 2021 18:42:36 -0600
Subject: [PATCH] Update __init__.py files

---
 scripts/wk/__init__.py         | 28 ++++++++++++++--------------
 scripts/wk/cfg/__init__.py     | 14 +++++++-------
 scripts/wk/hw/__init__.py      |  8 ++++----
 scripts/wk/kit/__init__.py     |  4 ++--
 scripts/wk/os/__init__.py      |  6 +++---
 scripts/wk/repairs/__init__.py |  2 +-
 scripts/wk/setup/__init__.py   |  7 +++++++
 scripts/wk/sw/__init__.py      |  1 -
 8 files changed, 38 insertions(+), 32 deletions(-)
 create mode 100644 scripts/wk/setup/__init__.py
 delete mode 100644 scripts/wk/sw/__init__.py

diff --git a/scripts/wk/__init__.py b/scripts/wk/__init__.py
index 25620f35..51521ea3 100644
--- a/scripts/wk/__init__.py
+++ b/scripts/wk/__init__.py
@@ -3,20 +3,20 @@
 
 from sys import version_info as version
 
-from wk import cfg
-from wk import debug
-from wk import exe
-from wk import graph
-from wk import hw
-from wk import io
-from wk import kit
-from wk import log
-from wk import net
-from wk import os
-from wk import repairs
-from wk import std
-from wk import sw
-from wk import tmux
+from . import cfg
+from . import debug
+from . import exe
+from . import graph
+from . import hw
+from . import io
+from . import kit
+from . import log
+from . import net
+from . import os
+from . import repairs
+from . import setup
+from . import std
+from . import tmux
 
 
 # Check env
diff --git a/scripts/wk/cfg/__init__.py b/scripts/wk/cfg/__init__.py
index d35b8874..c3eb64da 100644
--- a/scripts/wk/cfg/__init__.py
+++ b/scripts/wk/cfg/__init__.py
@@ -1,9 +1,9 @@
 """WizardKit: cfg module init"""
 
-from wk.cfg import ddrescue
-from wk.cfg import hw
-from wk.cfg import log
-from wk.cfg import main
-from wk.cfg import net
-from wk.cfg import tools
-from wk.cfg import ufd
+from . import ddrescue
+from . import hw
+from . import log
+from . import main
+from . import net
+from . import tools
+from . import ufd
diff --git a/scripts/wk/hw/__init__.py b/scripts/wk/hw/__init__.py
index ad2b04cb..741d3151 100644
--- a/scripts/wk/hw/__init__.py
+++ b/scripts/wk/hw/__init__.py
@@ -1,6 +1,6 @@
 """WizardKit: hw module init"""
 
-from wk.hw import ddrescue
-from wk.hw import diags
-from wk.hw import obj
-from wk.hw import sensors
+from . import ddrescue
+from . import diags
+from . import obj
+from . import sensors
diff --git a/scripts/wk/kit/__init__.py b/scripts/wk/kit/__init__.py
index 4641fae7..c6eedd73 100644
--- a/scripts/wk/kit/__init__.py
+++ b/scripts/wk/kit/__init__.py
@@ -3,7 +3,7 @@
 
 import platform
 
-from wk.kit import tools
+from . import tools
 
 if platform.system() == 'Linux':
-  from wk.kit import ufd
+  from . import ufd
diff --git a/scripts/wk/os/__init__.py b/scripts/wk/os/__init__.py
index dff18ac2..693ec59c 100644
--- a/scripts/wk/os/__init__.py
+++ b/scripts/wk/os/__init__.py
@@ -4,8 +4,8 @@
 import platform
 
 if platform.system() == 'Darwin':
-  from wk.os import mac
+  from . import mac
 if platform.system() == 'Linux':
-  from wk.os import linux
+  from . import linux
 if platform.system() == 'Windows':
-  from wk.os import win
+  from . import win
diff --git a/scripts/wk/repairs/__init__.py b/scripts/wk/repairs/__init__.py
index cbdf27e4..724c52c0 100644
--- a/scripts/wk/repairs/__init__.py
+++ b/scripts/wk/repairs/__init__.py
@@ -4,4 +4,4 @@
 import platform
 
 if platform.system() == 'Windows':
-  from wk.repairs import win
+  from . import win
diff --git a/scripts/wk/setup/__init__.py b/scripts/wk/setup/__init__.py
new file mode 100644
index 00000000..33b5ea29
--- /dev/null
+++ b/scripts/wk/setup/__init__.py
@@ -0,0 +1,7 @@
+"""WizardKit: repairs module init"""
+# vim: sts=2 sw=2 ts=2
+
+import platform
+
+#if platform.system() == 'Windows':
+#  from . import win
diff --git a/scripts/wk/sw/__init__.py b/scripts/wk/sw/__init__.py
deleted file mode 100644
index 1cc6236f..00000000
--- a/scripts/wk/sw/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""WizardKit: sw module init"""