From df1706a8bfa9187190efc8b1d3501484b0ca142f Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Tue, 19 Mar 2019 20:49:32 -0600
Subject: [PATCH] Disabled speedtest in d7II mode, moved to Post-d7

* Also updated post_d7.py to use 2-space indentation
---
 .bin/Scripts/post_d7.py        | 65 ++++++++++++++++++----------------
 .bin/Scripts/user_checklist.py |  3 +-
 2 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/.bin/Scripts/post_d7.py b/.bin/Scripts/post_d7.py
index e72c5869..2fa8f9f2 100644
--- a/.bin/Scripts/post_d7.py
+++ b/.bin/Scripts/post_d7.py
@@ -14,37 +14,42 @@ os.system('title {}: Post-d7II Work'.format(KIT_NAME_FULL))
 set_log_file('Post-d7II Work.log')
 
 if __name__ == '__main__':
-    try:
-        stay_awake()
-        clear_screen()
-        print_info('{}: Post-d7II Work\n'.format(KIT_NAME_FULL))
-        other_results = {
-            'Warning': {
-                'NotInstalledError': 'Not installed',
-                'NoProfilesError': 'No profiles found',
-            }}
+  try:
+    stay_awake()
+    clear_screen()
+    print_info('{}: Post-d7II Work\n'.format(KIT_NAME_FULL))
+    other_results = {
+      'Warning': {
+        'NotInstalledError': 'Not installed',
+        'NoProfilesError': 'No profiles found',
+      }}
 
-        # Scan for Firefox browsers
-        print_info('Scanning for Firefox browsers')
-        scan_for_browsers(just_firefox=True)
+    # Scan for Firefox browsers
+    print_info('Scanning for Firefox browsers')
+    scan_for_browsers(just_firefox=True)
 
-        # Install uBlock Origin
-        print_info('Installing uBlock Origin')
-        install_adblock(just_firefox=True)
+    # Install uBlock Origin
+    print_info('Installing uBlock Origin')
+    install_adblock(just_firefox=True)
 
-        # Cleanup
-        print_info('Cleanup')
-        try_and_print(message='d7II...',
-            function=cleanup_d7ii, cs='Done')
-        try_and_print(message='{}...'.format(KIT_NAME_FULL),
-            function=delete_empty_folders, cs='Done',
-            folder_path=global_vars['ClientDir'])
+    # Cleanup
+    print_info('Cleanup')
+    try_and_print(message='d7II...',
+      function=cleanup_d7ii, cs='Done')
+    try_and_print(message='{}...'.format(KIT_NAME_FULL),
+      function=delete_empty_folders, cs='Done',
+      folder_path=global_vars['ClientDir'])
 
-        # Done
-        print_standard('\nDone.')
-        pause('Press Enter to exit...')
-        exit_script()
-    except SystemExit:
-        pass
-    except:
-        major_exception()
+    # Run speedtest
+    popen_program(['start', '', 'https://fast.com'], shell=True)
+
+    # Done
+    print_standard('\nDone.')
+    pause('Press Enter to exit...')
+    exit_script()
+  except SystemExit:
+    pass
+  except:
+    major_exception()
+
+# vim: sts=2 sw=2 ts=2
diff --git a/.bin/Scripts/user_checklist.py b/.bin/Scripts/user_checklist.py
index 5d4af974..30a78730 100644
--- a/.bin/Scripts/user_checklist.py
+++ b/.bin/Scripts/user_checklist.py
@@ -85,7 +85,8 @@ if __name__ == '__main__':
       function=restart_explorer, cs='Done')
 
     # Run speedtest
-    popen_program(['start', '', 'https://fast.com'], shell=True)
+    if not D7_MODE:
+      popen_program(['start', '', 'https://fast.com'], shell=True)
 
     # Done
     if not D7_MODE: