From f70cf1604079835ead0e90b1b82fea4a11775b0a Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Tue, 28 May 2019 01:43:57 -0600
Subject: [PATCH] Updated system diagnostics

* Skip more sections under d7II mode
  * They will be handled by the new system setup script instead
* Fixed some formatting
---
 .bin/Scripts/system_diagnostics.py | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/.bin/Scripts/system_diagnostics.py b/.bin/Scripts/system_diagnostics.py
index 8158b081..74e92dd8 100644
--- a/.bin/Scripts/system_diagnostics.py
+++ b/.bin/Scripts/system_diagnostics.py
@@ -138,6 +138,7 @@ if __name__ == '__main__':
 
     if D7_MODE:
       # Archive all browsers for all users
+      print_standard(' ')
       archive_all_users()
     else:
       # Scan for supported browsers
@@ -149,24 +150,25 @@ if __name__ == '__main__':
     for k, v in sorted(BLEACH_BIT_CLEANERS.items()):
       try_and_print(message='{}...'.format(k),
         function=run_bleachbit,
-        cs='Done', other_results=other_results,
+        cs='SUCCESS', other_results=other_results,
         cleaners=v, preview=bool(not D7_MODE))
+    print_standard(' ')
 
     # Export system info
-    print_info('Backup System Information')
-    try_and_print(message='AIDA64 reports...',
-      function=run_aida64, cs='Done', other_results=other_results)
     if not D7_MODE:
+      print_info('Backup System Information')
+      try_and_print(message='AIDA64 reports...',
+        function=run_aida64, cs='SUCCESS', other_results=other_results)
       backup_browsers()
-    try_and_print(message='File listing...',
-      function=backup_file_list, cs='Done', other_results=other_results)
-    try_and_print(message='Power plans...',
-      function=backup_power_plans, cs='Done')
-    try_and_print(message='Product Keys...',
-      function=run_produkey, cs='Done', other_results=other_results)
-    try_and_print(message='Registry...',
-      function=backup_registry, cs='Done', other_results=other_results,
-      overwrite=True)
+      try_and_print(message='File listing...',
+        function=backup_file_list, cs='SUCCESS', other_results=other_results)
+      try_and_print(message='Power plans...',
+        function=backup_power_plans, cs='SUCCESS')
+      try_and_print(message='Product Keys...',
+        function=run_produkey, cs='SUCCESS', other_results=other_results)
+      try_and_print(message='Registry...',
+        function=backup_registry, cs='SUCCESS', other_results=other_results,
+        overwrite=True)
 
     # Summary
     if not D7_MODE: