Fix issue #102

.bin/Scripts/activate.py

@@ -55,8 +55,8 @@ if __name__ == '__main__':
     print_success('\nDone.')
     pause("Press Enter to exit...")
     exit_script()
-  except SystemExit:
-    pass
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
   except:
     major_exception()
 

.bin/Scripts/cbs_fix.py

@@ -35,8 +35,8 @@ if __name__ == '__main__':
     print_standard('\nDone.')
     pause("Press Enter to exit...")
     exit_script()
-  except SystemExit:
-    pass
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
   except:
     major_exception()
 

.bin/Scripts/check_disk.py

@@ -49,8 +49,8 @@ if __name__ == '__main__':
     print_success('Done.')
     pause("Press Enter to exit...")
     exit_script()
-  except SystemExit:
-    pass
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
   except:
     major_exception()
 

.bin/Scripts/ddrescue-tui-menu

@@ -54,8 +54,8 @@ if __name__ == '__main__':
       msg = str(ge)
     print_error(msg)
     abort()
-  except SystemExit:
-    pass
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
   except:
     major_exception()
 

.bin/Scripts/dism.py

@@ -50,8 +50,8 @@ if __name__ == '__main__':
     print_success('Done.')
     pause("Press Enter to exit...")
     exit_script()
-  except SystemExit:
-    pass
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
   except:
     major_exception()
 

.bin/Scripts/hw-diags-audio

@@ -34,8 +34,8 @@ if __name__ == '__main__':
     #print_standard('\nDone.')
     #pause("Press Enter to exit...")
     exit_script()
-  except SystemExit:
-    pass
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
   except:
     major_exception()
 

.bin/Scripts/hw-diags-menu

@@ -22,9 +22,8 @@ if __name__ == '__main__':
     print_standard(' ')
     sleep(1)
     pause('Press Enter to exit...')
-  except SystemExit:
-    # Normal exit
-    pass
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
   except:
     # Cleanup
     tmux_kill_all_panes()

.bin/Scripts/hw-diags-network

@@ -40,8 +40,8 @@ if __name__ == '__main__':
     print_standard('\nDone.')
     #pause("Press Enter to exit...")
     exit_script()
-  except SystemExit:
-    pass
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
   except:
     major_exception()
 

.bin/Scripts/hw-sensors-monitor

@@ -28,8 +28,8 @@ if __name__ == '__main__':
       run_program(cmd, check=False)
     monitor_sensors(monitor_pane, monitor_file)
     exit_script()
-  except SystemExit:
-    pass
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
   except:
     major_exception()
 

.bin/Scripts/install_sw_bundle.py

@@ -59,8 +59,8 @@ if __name__ == '__main__':
         other_results=other_results)
     print_standard('\nDone.')
     exit_script()
-  except SystemExit:
-    pass
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
   except:
     major_exception()
 

.bin/Scripts/install_vcredists.py

@@ -27,8 +27,8 @@ if __name__ == '__main__':
 
     print_standard('\nDone.')
     exit_script()
-  except SystemExit:
-    pass
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
   except:
     major_exception()
 

.bin/Scripts/mount-all-volumes

@@ -30,8 +30,8 @@ if __name__ == '__main__':
       pause("Press Enter to exit...")
       popen_program(['nohup', 'thunar', '/media'], pipe=True)
     exit_script()
-  except SystemExit:
-    pass
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
   except:
     major_exception()
 

.bin/Scripts/mount-backup-shares

@@ -30,8 +30,8 @@ if __name__ == '__main__':
     print_standard('\nDone.')
     #pause("Press Enter to exit...")
     exit_script()
-  except SystemExit:
-    pass
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
   except:
     major_exception()
 

.bin/Scripts/msword-search

@@ -76,8 +76,8 @@ if __name__ == '__main__':
     print_standard('\nDone.')
     #pause("Press Enter to exit...")
     exit_script()
-  except SystemExit:
-    pass
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
   except:
     major_exception()
 

.bin/Scripts/new_system_setup.py

@@ -152,8 +152,8 @@ if __name__ == '__main__':
     print_standard('\nDone.')
     pause('Press Enter to exit...')
     exit_script()
-  except SystemExit:
-    pass
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
   except:
     major_exception()
 

.bin/Scripts/safemode_enter.py

@@ -31,8 +31,8 @@ if __name__ == '__main__':
     pause('Press Enter to reboot...')
     reboot()
     exit_script()
-  except SystemExit:
-    pass
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
   except:
     major_exception()
 

.bin/Scripts/safemode_exit.py

@@ -31,8 +31,8 @@ if __name__ == '__main__':
     pause('Press Enter to reboot...')
     reboot()
     exit_script()
-  except SystemExit:
-    pass
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
   except:
     major_exception()
 

.bin/Scripts/sfc_scan.py

@@ -32,8 +32,8 @@ if __name__ == '__main__':
     print_standard('\nDone.')
     pause('Press Enter to exit...')
     exit_script()
-  except SystemExit:
-    pass
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
   except:
     major_exception()
 

.bin/Scripts/system_checklist.py

@@ -125,8 +125,8 @@ if __name__ == '__main__':
     print_standard('\nDone.')
     pause('Press Enter exit...')
     exit_script()
-  except SystemExit:
-    pass
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
   except:
     major_exception()
 

.bin/Scripts/system_diagnostics.py

@@ -165,8 +165,8 @@ if __name__ == '__main__':
     print_standard('\nDone.')
     pause('Press Enter to exit...')
     exit_script()
-  except SystemExit:
-    pass
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
   except:
     major_exception()
 

.bin/Scripts/transferred_keys.py

@@ -21,8 +21,8 @@ if __name__ == '__main__':
     # Done
     print_standard('\nDone.')
     exit_script()
-  except SystemExit:
-    pass
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
   except:
     major_exception()
 

.bin/Scripts/update_kit.py

@@ -134,8 +134,8 @@ if __name__ == '__main__':
     print_standard('\nDone.')
     pause("Press Enter to exit...")
     exit_script()
-  except SystemExit:
-    pass
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
   except:
     major_exception()
 

.bin/Scripts/user_checklist.py

@@ -82,8 +82,8 @@ if __name__ == '__main__':
     print_standard('\nDone.')
     pause('Press Enter to exit...')
     exit_script()
-  except SystemExit:
-    pass
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
   except:
     major_exception()
 

.bin/Scripts/user_data_transfer.py

@@ -59,8 +59,8 @@ if __name__ == '__main__':
     print_standard('\nDone.')
     pause("Press Enter to exit...")
     exit_script()
-  except SystemExit:
-    pass
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
   except:
     major_exception()
 

.bin/Scripts/winpe_root_menu.py

@@ -15,8 +15,8 @@ set_log_file('WinPE.log')
 if __name__ == '__main__':
   try:
     menu_root()
-  except SystemExit:
-    pass
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
   except:
     major_exception()