From 1a26aead442f179b99c260d1e3e985aa0eb92f9f Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Tue, 28 Jan 2020 18:38:33 -0700
Subject: [PATCH 01/11] Network test working under macOS

---
 scripts/wk/hw/diags.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/wk/hw/diags.py b/scripts/wk/hw/diags.py
index 03e9628a..3dd7a189 100644
--- a/scripts/wk/hw/diags.py
+++ b/scripts/wk/hw/diags.py
@@ -431,10 +431,10 @@ def build_menu(cli_mode=False, quick_mode=False):
 
   # Compatibility checks
   if PLATFORM != 'Linux':
-    for name in ('Audio Test', 'Keyboard Test', 'Network Test'):
+    for name in ('Audio Test', 'Keyboard Test'):
       menu.actions[name]['Disabled'] = True
   if PLATFORM not in ('Darwin', 'Linux'):
-    for name in ('Matrix', 'Tubes'):
+    for name in ('Matrix', 'Network Test', 'Tubes'):
       menu.actions[name]['Disabled'] = True
 
   # Done

From 98032a0fed70b90d6a38b5d5ffb2d2ba17d3ee12 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Tue, 28 Jan 2020 19:00:47 -0700
Subject: [PATCH 02/11] Removed stale TODO statements

---
 scripts/wk/hw/diags.py | 1 -
 scripts/wk/hw/obj.py   | 1 -
 scripts/wk/kit/ufd.py  | 3 ---
 scripts/wk/net.py      | 1 -
 scripts/wk/os/linux.py | 1 -
 scripts/wk/os/win.py   | 2 +-
 6 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/scripts/wk/hw/diags.py b/scripts/wk/hw/diags.py
index 3dd7a189..9aab1887 100644
--- a/scripts/wk/hw/diags.py
+++ b/scripts/wk/hw/diags.py
@@ -383,7 +383,6 @@ def audio_test():
   """Run an OS-specific audio test."""
   if PLATFORM == 'Linux':
     audio_test_linux()
-  # TODO: Add tests for other OS
 
 
 def audio_test_linux():
diff --git a/scripts/wk/hw/obj.py b/scripts/wk/hw/obj.py
index eca9a4db..1d9dbde6 100644
--- a/scripts/wk/hw/obj.py
+++ b/scripts/wk/hw/obj.py
@@ -385,7 +385,6 @@ class Disk(BaseObj):
       aligned = is_4k_aligned_macos(self.details)
     elif PLATFORM == 'Linux':
       aligned = is_4k_aligned_linux(self.path, self.details['phy-sec'])
-    #TODO: Add checks for other OS
 
     return aligned
 
diff --git a/scripts/wk/kit/ufd.py b/scripts/wk/kit/ufd.py
index 6df842de..9c792b3b 100644
--- a/scripts/wk/kit/ufd.py
+++ b/scripts/wk/kit/ufd.py
@@ -1,8 +1,5 @@
 """WizardKit: UFD Functions"""
 # vim: sts=2 sw=2 ts=2
-# TODO: Replace some lsblk usage with hw_obj?
-# TODO: Reduce imports if possible
-# TODO: Needs testing
 
 import logging
 import os
diff --git a/scripts/wk/net.py b/scripts/wk/net.py
index 8b930c3b..e8e763b5 100644
--- a/scripts/wk/net.py
+++ b/scripts/wk/net.py
@@ -181,7 +181,6 @@ def share_is_mounted(details):
       if row['source'] == f'//{details["Address"]}/{details["Share"]}':
         mounted = True
         break
-  #TODO: Check mount status under Windows
   #elif PLATFORM == 'Windows':
 
   # Done
diff --git a/scripts/wk/os/linux.py b/scripts/wk/os/linux.py
index 7c38a03f..e4aefab8 100644
--- a/scripts/wk/os/linux.py
+++ b/scripts/wk/os/linux.py
@@ -179,7 +179,6 @@ def running_as_root():
 
 def scan_corestorage_container(container, timeout=300):
   """Scan CoreStorage container for inner volumes, returns list."""
-  # TODO: Test Scanning CoreStorage containers
   detected_volumes = {}
   inner_volumes = []
   log_path = format_log_path(log_name=f'{container.path.name}_testdisk')
diff --git a/scripts/wk/os/win.py b/scripts/wk/os/win.py
index f367e40f..7f17af37 100644
--- a/scripts/wk/os/win.py
+++ b/scripts/wk/os/win.py
@@ -15,7 +15,7 @@ from wk.std import GenericError, GenericWarning, sleep
 
 # STATIC VARIABLES
 LOG = logging.getLogger(__name__)
-OS_VERSION = float(platform.win32_ver()[0]) # TODO: Check if Win8.1 returns '8'
+OS_VERSION = float(platform.win32_ver()[0])
 REG_MSISERVER = r'HKLM\SYSTEM\CurrentControlSet\Control\SafeBoot\Network\MSIServer'
 SLMGR = pathlib.Path(f'{os.environ.get("SYSTEMROOT")}/System32/slmgr.vbs')
 

From 41130a38edf14b66cc7c1fa447d45d2699de540a Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Thu, 30 Jan 2020 13:02:41 -0700
Subject: [PATCH 03/11] Fix running tmux in live macOS env

---
 scripts/launch-in-tmux | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/scripts/launch-in-tmux b/scripts/launch-in-tmux
index 2be76959..f0940b00 100755
--- a/scripts/launch-in-tmux
+++ b/scripts/launch-in-tmux
@@ -2,6 +2,12 @@
 #
 ## Wizard Kit: TMUX Launcher
 
+# Live macOS env workaround
+tmux_args=()
+if [[ -e "/.wk-live-macos" ]]; then
+  tmux_args=(-f "/etc/tmux.conf" -S "$(mktemp).socket")
+fi
+
 function ask() {
     while :; do
         read -p "$1 [Y/N] " -r answer
@@ -25,24 +31,24 @@ function launch_in_tmux() {
   [[ -n "${TMUX_CMD:-}" ]] || return $(err "Required variable missing (TMUX_CMD)")
 
   # Check for running session
-  if tmux list-session | grep -q "$SESSION_NAME"; then
+  if tmux "${tmux_args[@]}" list-session | grep -q "$SESSION_NAME"; then
       echo "WARNING: tmux session $SESSION_NAME already exists."
       echo ""
       if ask "Connect to current session?"; then
           if [[ -n "${TMUX:-}" ]]; then
               # Running inside TMUX, switch to session
-              tmux switch-client -t "$SESSION_NAME"
+              tmux "${tmux_args[@]}" switch-client -t "$SESSION_NAME"
               if ! jobs %% >/dev/null 2>&1; then
                 # No running jobs, try exiting abandoned tmux session
                 exit 0
               fi
           else
               # Running outside TMUX, attach to session
-              tmux attach-session -t "$SESSION_NAME"
+              tmux "${tmux_args[@]}" attach-session -t "$SESSION_NAME"
           fi
           return 0
       elif ask "Kill current session and start new session?"; then
-          tmux kill-session -t "$SESSION_NAME" || \
+          tmux "${tmux_args[@]}" kill-session -t "$SESSION_NAME" || \
               die "Failed to kill session: $SESSION_NAME"
       else
           echo "Aborted."
@@ -53,16 +59,16 @@ function launch_in_tmux() {
   # Start session
   if [[ -n "${TMUX:-}" ]]; then
       # Running inside TMUX, save current session/window names
-      ORIGINAL_SESSION_NAME="$(tmux display-message -p '#S')"
-      ORIGINAL_WINDOW_NAME="$(tmux display-message -p '#W')"
-      tmux rename-session "$SESSION_NAME"
-      tmux rename-window "$WINDOW_NAME"
+      ORIGINAL_SESSION_NAME="$(tmux "${tmux_args[@]}" display-message -p '#S')"
+      ORIGINAL_WINDOW_NAME="$(tmux "${tmux_args[@]}" display-message -p '#W')"
+      tmux "${tmux_args[@]}" rename-session "$SESSION_NAME"
+      tmux "${tmux_args[@]}" rename-window "$WINDOW_NAME"
       "$TMUX_CMD" "$@"
       # Restore previous session/window names
-      tmux rename-session "${ORIGINAL_SESSION_NAME}"
-      tmux rename-window "${ORIGINAL_WINDOW_NAME}"
+      tmux "${tmux_args[@]}" rename-session "${ORIGINAL_SESSION_NAME}"
+      tmux "${tmux_args[@]}" rename-window "${ORIGINAL_WINDOW_NAME}"
   else
       # Running outside TMUX, start/attach to session
-      tmux new-session -s "$SESSION_NAME" -n "$WINDOW_NAME" "$TMUX_CMD" "$@"
+      tmux "${tmux_args[@]}" new-session -s "$SESSION_NAME" -n "$WINDOW_NAME" "$TMUX_CMD" "$@"
   fi
 }

From e1943b9fb48354fca955eb0bbc24a27c4f7ce537 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Thu, 30 Jan 2020 13:03:21 -0700
Subject: [PATCH 04/11] Strip sudo use if running as root on Linux/macOS

* Allows running under live macOS
---
 scripts/wk/exe.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/wk/exe.py b/scripts/wk/exe.py
index 17f49249..e49b51d6 100644
--- a/scripts/wk/exe.py
+++ b/scripts/wk/exe.py
@@ -3,6 +3,7 @@
 
 import json
 import logging
+import os
 import re
 import subprocess
 
@@ -77,6 +78,10 @@ def build_cmd_kwargs(cmd, minimized=False, pipe=True, shell=False, **kwargs):
     'shell': shell,
     }
 
+  # Strip sudo if appropriate
+  if cmd[0] == 'sudo' and os.name == 'posix' and os.geteuid() == 0:
+    cmd.pop(0)
+
   # Add additional kwargs if applicable
   for key in 'check cwd encoding errors stderr stdin stdout'.split():
     if key in kwargs:

From c7d57ff2667a2de170510255cdcc2bb0e7fbd6f7 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Thu, 30 Jan 2020 13:07:04 -0700
Subject: [PATCH 05/11] Fixed logging under live macOS

---
 scripts/wk/log.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/wk/log.py b/scripts/wk/log.py
index ee512c95..2cb39764 100644
--- a/scripts/wk/log.py
+++ b/scripts/wk/log.py
@@ -13,7 +13,10 @@ from wk.io import non_clobber_path
 
 
 # STATIC VARIABLES
-if os.name == 'nt':
+if os.path.exists('/.wk-live-macos'):
+  # Workaround for live macOS env
+  DEFAULT_LOG_DIR = '/var/log/WizardKit'
+elif os.name == 'nt':
   # Example: "C:\WK\1955-11-05\WizardKit"
   DEFAULT_LOG_DIR = (
     f'{os.environ.get("SYSTEMDRIVE", "C:")}/'

From 4a3981e10c123ab038975dcbb239a18d66ae6201 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Thu, 30 Jan 2020 13:08:13 -0700
Subject: [PATCH 06/11] Adjusted menus under live macOS

---
 scripts/wk/std.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/wk/std.py b/scripts/wk/std.py
index 4e84a25e..60c110f9 100644
--- a/scripts/wk/std.py
+++ b/scripts/wk/std.py
@@ -134,6 +134,8 @@ class Menu():
     checkmark = '*'
     if 'DISPLAY' in os.environ or PLATFORM == 'Darwin':
       checkmark = '✓'
+    if os.path.exists('/.wk-live-macos'):
+      checkmark = '*'
     display_name = f'{index if index else name[:1].upper()}: '
     if not (index and index >= 10):
       display_name = f' {display_name}'

From 417241acb51428c7ac8d5f7c0f57263a6a063973 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Thu, 30 Jan 2020 13:09:57 -0700
Subject: [PATCH 07/11] Fixed clearing the screen under live macOS

---
 scripts/wk/std.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/wk/std.py b/scripts/wk/std.py
index 60c110f9..b25b7b9f 100644
--- a/scripts/wk/std.py
+++ b/scripts/wk/std.py
@@ -728,7 +728,11 @@ def choice(choices, prompt='答えろ！'):
 def clear_screen():
   """Simple wrapper for clear/cls."""
   cmd = 'cls' if os.name == 'nt' else 'clear'
-  subprocess.run(cmd, check=False, shell=True, stderr=subprocess.PIPE)
+  proc = subprocess.run(cmd, check=False, shell=True, stderr=subprocess.PIPE)
+
+  # Workaround for live macOS env
+  if proc.returncode != 0:
+    print('\033c')
 
 
 def color_string(strings, colors, sep=' '):

From 86f0f1e5fdc611ff54d79f590db37e221754fa33 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Thu, 30 Jan 2020 13:16:48 -0700
Subject: [PATCH 08/11] Avoid rare crash concerning disk attributes

* Crash would occur under these circumstances:
  * Disk Attributes test was not selected
  * One or more other disk tests were selected
  * A non-blocking attribute error was detected
---
 scripts/wk/hw/diags.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/wk/hw/diags.py b/scripts/wk/hw/diags.py
index 9aab1887..87b4ec27 100644
--- a/scripts/wk/hw/diags.py
+++ b/scripts/wk/hw/diags.py
@@ -198,7 +198,11 @@ class State():
               )
       else:
         # No blocking errors encountered, check for minor attribute failures
-        if not disk.check_attributes(only_blocking=False):
+        if ('Disk Attributes' in disk.tests:
+            and not disk.tests['Disk Attributes'].failed
+            and not disk.check_attributes(only_blocking=False)):
+          # Mid-diag failure detected
+          LOG.warning('Disk attributes failure detected during diagnostics')
           disk.tests['Disk Attributes'].failed = True
           disk.tests['Disk Attributes'].set_status('Failed')
 

From c8f95d866a572ead485e11380aa32dfc15d48fcc Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Thu, 30 Jan 2020 13:24:49 -0700
Subject: [PATCH 09/11] Typo fix

---
 scripts/wk/hw/diags.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/wk/hw/diags.py b/scripts/wk/hw/diags.py
index 87b4ec27..f36b5471 100644
--- a/scripts/wk/hw/diags.py
+++ b/scripts/wk/hw/diags.py
@@ -198,7 +198,7 @@ class State():
               )
       else:
         # No blocking errors encountered, check for minor attribute failures
-        if ('Disk Attributes' in disk.tests:
+        if ('Disk Attributes' in disk.tests
             and not disk.tests['Disk Attributes'].failed
             and not disk.check_attributes(only_blocking=False)):
           # Mid-diag failure detected

From dc6dcfb84528f5f28f683c11603a3dbac7278298 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Thu, 30 Jan 2020 13:25:46 -0700
Subject: [PATCH 10/11] Revert "Avoid crash during SMART self-test"

This reverts commit cc8c0992f659c89127c24baf420313d0a9f3decc.
---
 scripts/wk/hw/obj.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/scripts/wk/hw/obj.py b/scripts/wk/hw/obj.py
index 1d9dbde6..7087fda9 100644
--- a/scripts/wk/hw/obj.py
+++ b/scripts/wk/hw/obj.py
@@ -368,13 +368,9 @@ class Disk(BaseObj):
     try:
       details = self.smartctl['ata_smart_data']['self_test']
     except (KeyError, TypeError):
-      # Assuming disk lacks SMART support, ignore and return nearly empty dict.
+      # Assuming disk lacks SMART support, ignore and return empty dict.
       pass
 
-    # Ensure status is present even if empty
-    if 'status' not in details:
-      details['status'] = {}
-
     # Done
     return details
 

From 385b2158fd11e150362b6f5aa3064cf75c17b798 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Thu, 30 Jan 2020 13:28:52 -0700
Subject: [PATCH 11/11] Improved method to avoid crash during self-tests

---
 scripts/wk/hw/obj.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/wk/hw/obj.py b/scripts/wk/hw/obj.py
index 7087fda9..a8719358 100644
--- a/scripts/wk/hw/obj.py
+++ b/scripts/wk/hw/obj.py
@@ -497,11 +497,11 @@ class Disk(BaseObj):
           _f.write(f'{header_str}\nSMART self-test status:\n  {status_str}')
 
         # Check if finished
-        if 'remaining_percent' not in test_details['status']:
+        if 'remaining_percent' not in test_details.get('status', {}):
           finished = True
           break
 
-      elif 'remaining_percent' in test_details['status']:
+      elif 'remaining_percent' in test_details.get('status', {}):
         started = True
 
     # Check result