From 5afb45dbb3f96ebabde6b61f9c29e11d3b5e2c07 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Sat, 8 Oct 2022 20:46:24 -0700 Subject: [PATCH] Add "Apply ITS Settings" to Auto Setup Addresses issue #18 --- scripts/auto_setup.py | 3 ++- scripts/wk/setup/win.py | 23 +++++++++++++++++++++-- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/scripts/auto_setup.py b/scripts/auto_setup.py index afd8749e..01b605ce 100644 --- a/scripts/auto_setup.py +++ b/scripts/auto_setup.py @@ -41,7 +41,7 @@ BASE_MENUS = { MenuEntry('Software Bundle', 'auto_install_software_bundle'), ), 'Configure System': ( - MenuEntry('Configure Browsers', 'auto_config_browsers'), + MenuEntry('Apply ITS Settings', 'auto_apply_its_settings'), MenuEntry('Open Shell', 'auto_config_open_shell'), MenuEntry('Disable Fast Startup', 'auto_disable_fast_startup', selected=False), MenuEntry('Disable Telemetry', 'auto_shutup_10'), @@ -54,6 +54,7 @@ BASE_MENUS = { MenuEntry('Windows Activation', 'auto_activate_windows'), MenuEntry('Windows Explorer', 'auto_config_explorer'), MenuEntry(r'Windows\Temp Fix', 'auto_windows_temp_fix'), + MenuEntry('Configure Browsers', 'auto_config_browsers'), MenuEntry('Create System Restore', 'auto_system_restore_create'), ), 'System Information': ( diff --git a/scripts/wk/setup/win.py b/scripts/wk/setup/win.py index 5b89291a..0dc7cb8c 100644 --- a/scripts/wk/setup/win.py +++ b/scripts/wk/setup/win.py @@ -223,6 +223,9 @@ def check_os_and_set_menu_title(title): def load_preset(menus, presets, title, enable_menu_exit=True): """Load menu settings from preset and ask selection question(s).""" + msp = False + + # Menu exit entry if not enable_menu_exit: MENU_PRESETS.actions['Main Menu'].update({'Disabled':True, 'Hidden':True}) @@ -259,11 +262,17 @@ def load_preset(menus, presets, title, enable_menu_exit=True): for option in ('Disable Fast Startup', 'Enable Hibernation'): menus['Configure System'].options[option]['Selected'] = True + # Apply ITS settings? + msp = ask('Is this an ITS system?') + if msp: + option = 'Apply ITS Settings' + menus['Configure System'].options[option]['Selected'] = True + # ESET NOD32 AV print('') - if ask('Install ESET NOD32 AV?'): + if msp or ask('Install ESET NOD32 AV?'): option = 'ESET NOD32 AV' - if ask(' For ITS/VIP?'): + if msp or ask(' For VIP?'): option = f'{option} (MSP)' menus['Install Software'].options[option]['Selected'] = True @@ -420,6 +429,11 @@ def auto_enable_regback(): ) +def auto_apply_its_settings(): + """Apply ITS settings.""" + TRY_PRINT.run('Apply ITS settings...', apply_its_settings) + + def auto_system_restore_enable(): """Enable System Restore.""" cmd = [ @@ -955,6 +969,11 @@ def uninstall_firefox(): # Misc Functions +def apply_its_settings(): + """Apply ITS settings.""" + create_custom_power_plan(enable_sleep=False) + + def check_secure_boot_status(): """Check Secure Boot status.""" is_secure_boot_enabled(raise_exceptions=True, show_alert=True)