From 6d7a5e1eae825b68c7a0389bb7e92dc76d94b17e Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Sun, 17 Mar 2019 21:25:04 -0600
Subject: [PATCH] Updated system_checklist_hw.py

---
 .bin/Scripts/system_checklist_hw.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.bin/Scripts/system_checklist_hw.py b/.bin/Scripts/system_checklist_hw.py
index fd08fe10..1edb0e96 100644
--- a/.bin/Scripts/system_checklist_hw.py
+++ b/.bin/Scripts/system_checklist_hw.py
@@ -4,14 +4,13 @@ import os
 import sys
 
 # Init
-os.chdir(os.path.dirname(os.path.realpath(__file__)))
-sys.path.append(os.getcwd())
+sys.path.append(os.path.dirname(os.path.realpath(__file__)))
 from functions.activation import *
 from functions.cleanup import *
-from functions.diags import *
 from functions.info import *
 from functions.product_keys import *
 from functions.setup import *
+from functions.sw_diags import *
 init_global_vars()
 os.system('title {}: System HW Checklist Tool'.format(KIT_NAME_FULL))
 set_log_file('System HW Checklist.log')
@@ -107,7 +106,7 @@ if __name__ == '__main__':
       function=run_xmplay, cs='Started', other_results=other_results)
     try:
       check_secure_boot_status(show_alert=True)
-    except:
+    except Exception:
       # Only trying to open alert message boxes
       pass