From baaf1994e3312df5f39ee4bdd8c3009dacd50b9f Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Sun, 16 Dec 2018 22:44:46 -0700
Subject: [PATCH] Catch keyboard interrupt and gracefully abort

---
 .bin/Scripts/hw-diags-menu | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/.bin/Scripts/hw-diags-menu b/.bin/Scripts/hw-diags-menu
index 6f0247cd..5b6f4f76 100755
--- a/.bin/Scripts/hw-diags-menu
+++ b/.bin/Scripts/hw-diags-menu
@@ -13,20 +13,25 @@ from functions.tmux import *
 init_global_vars()
 
 if __name__ == '__main__':
+  # Show menu
   try:
-    # Show menu
     state = State()
     menu_diags(state, sys.argv)
-
-    # Done
-    #print_standard('\nDone.')
-    #pause("Press Enter to exit...")
-    exit_script()
+  except KeyboardInterrupt:
+    print_standard(' ')
+    print_warning('Aborted')
+    print_standard(' ')
+    sleep(1)
+    pause('Press Enter to exit...')
   except SystemExit:
-    tmux_kill_all_panes()
+    # Normal exit
     pass
   except:
     tmux_kill_all_panes()
     major_exception()
 
+  # Done
+  tmux_kill_all_panes()
+  exit_script()
+
 # vim: sts=2 sw=2 ts=2