From e301617ca03eee256a02b83b82bd98917ad2e959 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Thu, 30 Jan 2020 20:05:15 -0700
Subject: [PATCH 1/3] Revert "Adjusted menus under live macOS"

This reverts commit 4a3981e10c123ab038975dcbb239a18d66ae6201.
---
 scripts/wk/std.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/wk/std.py b/scripts/wk/std.py
index c715706a..e30c3fd7 100644
--- a/scripts/wk/std.py
+++ b/scripts/wk/std.py
@@ -134,8 +134,6 @@ 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 e773a052654a8ca7afffd1e32a8814a854d9b18f Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Mon, 3 Feb 2020 17:25:44 -0700
Subject: [PATCH 2/3] Bumped year in LICENSE.txt

---
 LICENSE.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index f29c29e6..4329e378 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2019 Alan Mason
+Copyright (c) 2020 Alan Mason
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

From 3b640ac85b2211721e1494fc639e0cb47dca677f Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Mon, 3 Feb 2020 18:09:46 -0700
Subject: [PATCH 3/3] Addressed issue #153

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

diff --git a/scripts/wk/hw/obj.py b/scripts/wk/hw/obj.py
index 0c33296e..a67d8e98 100644
--- a/scripts/wk/hw/obj.py
+++ b/scripts/wk/hw/obj.py
@@ -35,6 +35,7 @@ NVME_WARNING_KEYS = (
   'reliability_degraded',
   'volatile_memory_backup_failed',
   )
+SMART_SELF_TEST_START_TIMEOUT_IN_SECONDS = 120
 WK_LABEL_REGEX = re.compile(
   fr'{KIT_NAME_SHORT}_(LINUX|UFD)',
   re.IGNORECASE,
@@ -504,6 +505,9 @@ class Disk(BaseObj):
 
       elif 'remaining_percent' in test_details.get('status', {}):
         started = True
+      elif _i * 5 >= SMART_SELF_TEST_START_TIMEOUT_IN_SECONDS:
+        # Test didn't start within limit, stop waiting
+        break
 
     # Check result
     if finished: