From da61ea38564f36d81c35bd63554b1e9aa3e9f1b3 Mon Sep 17 00:00:00 2001
From: 2Shirt <1923621+2Shirt@users.noreply.github.com>
Date: Tue, 22 May 2018 19:33:21 -0600
Subject: [PATCH] Updated SW diag/checklist summaries to match

* Also added AV check to SW diag
---
 .bin/Scripts/system_checklist.py   |  8 +++-----
 .bin/Scripts/system_diagnostics.py | 24 ++++++++++++++----------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/.bin/Scripts/system_checklist.py b/.bin/Scripts/system_checklist.py
index c24e9fb1..73410d92 100644
--- a/.bin/Scripts/system_checklist.py
+++ b/.bin/Scripts/system_checklist.py
@@ -32,8 +32,6 @@ if __name__ == '__main__':
         if ENABLED_TICKET_NUMBERS:
             print_info('Starting System Checklist for Ticket #{}\n'.format(
                 ticket_number))
-        else:
-            print_info('Starting System Checklist\n')
 
         # Configure
         print_info('Configure')
@@ -78,15 +76,15 @@ if __name__ == '__main__':
             try_and_print(message='BIOS Activation:',
                 function=activate_with_bios,
                 other_results=other_results)
+        try_and_print(message='Installed RAM:',
+            function=show_installed_ram, ns='Unknown', silent_function=False)
+        show_free_space()
         try_and_print(message='Installed Antivirus:',
             function=get_installed_antivirus, ns='Unknown',
             other_results=other_results, print_return=True)
         try_and_print(message='Installed Office:',
             function=get_installed_office, ns='Unknown',
             other_results=other_results, print_return=True)
-        show_free_space()
-        try_and_print(message='Installed RAM:',
-            function=show_installed_ram, ns='Unknown', silent_function=False)
 
         # Play audio, show devices, open Windows updates, and open Activation
         try_and_print(message='Opening Device Manager...',
diff --git a/.bin/Scripts/system_diagnostics.py b/.bin/Scripts/system_diagnostics.py
index a6b014f1..9a6e1c0b 100644
--- a/.bin/Scripts/system_diagnostics.py
+++ b/.bin/Scripts/system_diagnostics.py
@@ -87,19 +87,23 @@ if __name__ == '__main__':
         
         # Summary
         print_info('Summary')
-        try_and_print(message='Temp Size:',
-            function=show_temp_files_size, silent_function=False)
-        show_free_space()
-        try_and_print(message='Installed RAM:',
-            function=show_installed_ram, ns='Unknown', silent_function=False)
-        try_and_print(message='Installed Office:',
-            function=get_installed_office, ns='Unknown', print_return=True)
-        try_and_print(message='Product Keys:',
-            function=get_product_keys, ns='Unknown', print_return=True)
         try_and_print(message='Operating System:',
             function=show_os_name, ns='Unknown', silent_function=False)
-        try_and_print(message='',
+        try_and_print(message='Activation:',
             function=show_os_activation, ns='Unknown', silent_function=False)
+        try_and_print(message='Installed RAM:',
+            function=show_installed_ram, ns='Unknown', silent_function=False)
+        show_free_space()
+        try_and_print(message='Temp Size:',
+            function=show_temp_files_size, silent_function=False)
+        try_and_print(message='Installed Antivirus:',
+            function=get_installed_antivirus, ns='Unknown',
+            other_results=other_results, print_return=True)
+        try_and_print(message='Installed Office:',
+            function=get_installed_office, ns='Unknown',
+            other_results=other_results, print_return=True)
+        try_and_print(message='Product Keys:',
+            function=get_product_keys, ns='Unknown', print_return=True)
         
         # User data
         print_info('User Data')