From e711258850c9105ff434a0ba47fed4e9c844a1bf Mon Sep 17 00:00:00 2001
From: Alan Mason <1923621+2Shirt@users.noreply.github.com>
Date: Wed, 22 Nov 2017 21:02:36 -0800
Subject: [PATCH] Updated SafeMode Enter & Exit scripts

---
 .bin/Scripts/safemode_enter.py | 32 +++++++++++++++++---------------
 .bin/Scripts/safemode_exit.py  | 26 ++++++++++++++------------
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/.bin/Scripts/safemode_enter.py b/.bin/Scripts/safemode_enter.py
index 80a0094a..8421f5d2 100644
--- a/.bin/Scripts/safemode_enter.py
+++ b/.bin/Scripts/safemode_enter.py
@@ -17,22 +17,24 @@ if __name__ == '__main__':
     try:
         os.system('cls')
         print_info('{}: SafeMode Tool\n'.format(KIT_NAME_FULL))
-        if ask('Enable booting to SafeMode (with Networking)?'):
-            # Edit BCD to set safeboot as default
-            cmd = ['bcdedit', '/set', '{default}', 'safeboot', 'network']
-            run_program(cmd, check=False)
-            
-            # Enable MSI access under safemode
-            cmd = ['reg', 'add', REG_MSISERVER, '/f']
-            run_program(cmd, check=False)
-            cmd = ['reg', 'add', REG_MSISERVER, '/ve',
-                    '/t', 'REG_SZ', '/d', 'Service', '/f']
-            run_program(cmd, check=False)
+        if not ask('Enable booting to SafeMode (with Networking)?'):
+            abort()
         
-            ## Done ##
-            pause('Press Enter to reboot...')
-            cmd = ['shutdown', '-r', '-t', '3']
-            run_program(cmd, check=False)
+        # Edit BCD to set safeboot as default
+        cmd = ['bcdedit', '/set', '{default}', 'safeboot', 'network']
+        run_program(cmd, check=False)
+        
+        # Enable MSI access under safemode
+        cmd = ['reg', 'add', REG_MSISERVER, '/f']
+        run_program(cmd, check=False)
+        cmd = ['reg', 'add', REG_MSISERVER, '/ve',
+                '/t', 'REG_SZ', '/d', 'Service', '/f']
+        run_program(cmd, check=False)
+    
+        ## Done ##
+        pause('Press Enter to reboot...')
+        cmd = ['shutdown', '-r', '-t', '3']
+        run_program(cmd, check=False)
         
         # Done
         exit_script()
diff --git a/.bin/Scripts/safemode_exit.py b/.bin/Scripts/safemode_exit.py
index 35b4d38b..00a101fe 100644
--- a/.bin/Scripts/safemode_exit.py
+++ b/.bin/Scripts/safemode_exit.py
@@ -17,20 +17,22 @@ if __name__ == '__main__':
     try:
         os.system('cls')
         print_info('{}: SafeMode Tool\n'.format(KIT_NAME_FULL))
-        if ask('Disable booting to SafeMode?'):
-            # Edit BCD to remove safeboot value
-            for boot in ['{current}', '{default}']:
-                cmd = ['bcdedit', '/deletevalue', boot, 'safeboot']
-                run_program(cmd, check=False)
-            
-            # Disable MSI access under safemode
-            cmd = ['reg', 'delete', REG_MSISERVER, '/f']
+        if not ask('Disable booting to SafeMode?'):
+            abort()
+        
+        # Edit BCD to remove safeboot value
+        for boot in ['{current}', '{default}']:
+            cmd = ['bcdedit', '/deletevalue', boot, 'safeboot']
             run_program(cmd, check=False)
         
-            ## Done ##
-            pause('Press Enter to reboot...')
-            cmd = ['shutdown', '-r', '-t', '3']
-            run_program(cmd, check=False)
+        # Disable MSI access under safemode
+        cmd = ['reg', 'delete', REG_MSISERVER, '/f']
+        run_program(cmd, check=False)
+        
+        ## Done ##
+        pause('Press Enter to reboot...')
+        cmd = ['shutdown', '-r', '-t', '3']
+        run_program(cmd, check=False)
         
         # Done
         exit_script()