From 597a23608951f38dfc3b987eed3ebff053081c98 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Tue, 4 Dec 2018 18:44:52 -0700
Subject: [PATCH] Don't clear screen twice at startup

* Combined init_global_vars and add_devs output
---
 .bin/Scripts/functions/hw_diags.py | 5 ++++-
 .bin/Scripts/hw-diags-menu         | 3 ---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.bin/Scripts/functions/hw_diags.py b/.bin/Scripts/functions/hw_diags.py
index 67195d79..6c43fe28 100644
--- a/.bin/Scripts/functions/hw_diags.py
+++ b/.bin/Scripts/functions/hw_diags.py
@@ -166,7 +166,10 @@ class State():
       'badblocks':        {'Enabled': False, 'Order': 3},
       'I/O Benchmark':    {'Enabled': False, 'Order': 4},
     }
-    self.add_devs()
+    try_and_print(
+      message='Scanning devices...',
+      function=self.add_devs,
+      cs='Done')
 
   def add_devs(self):
     """Add all block devices listed by lsblk."""
diff --git a/.bin/Scripts/hw-diags-menu b/.bin/Scripts/hw-diags-menu
index c67cc5f4..e60f8fc4 100755
--- a/.bin/Scripts/hw-diags-menu
+++ b/.bin/Scripts/hw-diags-menu
@@ -13,9 +13,6 @@ init_global_vars()
 
 if __name__ == '__main__':
     try:
-        # Prep
-        clear_screen()
-
         # Show menu
         state = State()
         menu_diags(state, sys.argv)