From 6db1be40463c59216bc379cf3fe6eb22c5ff8dd0 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Sat, 2 Oct 2021 17:25:02 -0600 Subject: [PATCH] Add ESET to selection questions --- scripts/auto_setup.py | 4 ++-- scripts/wk/setup/win.py | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/scripts/auto_setup.py b/scripts/auto_setup.py index 1ea9888a..bf716e6c 100644 --- a/scripts/auto_setup.py +++ b/scripts/auto_setup.py @@ -110,8 +110,8 @@ BASE_MENUS = { ), 'Install Software': ( MenuEntry('Visual C++ Runtimes', 'auto_install_vcredists'), - MenuEntry('ESET NOD32 AV', 'install_eset_nod32_av'), - MenuEntry('ESET NOD32 AV (MSP)', 'install_eset_nod32_av_msp'), + MenuEntry('ESET NOD32 AV', 'auto_install_eset_nod32_av', selected=False), + MenuEntry('ESET NOD32 AV (MSP)', 'auto_install_eset_nod32_av_msp', selected=False), MenuEntry('Firefox', 'auto_install_firefox'), MenuEntry('LibreOffice', 'auto_install_libreoffice', selected=False), MenuEntry('Open Shell', 'auto_install_open_shell'), diff --git a/scripts/wk/setup/win.py b/scripts/wk/setup/win.py index 40e604c6..736836f2 100644 --- a/scripts/wk/setup/win.py +++ b/scripts/wk/setup/win.py @@ -387,8 +387,14 @@ def load_preset(menus, presets, title, enable_menu_exit=True): clear_screen() print_standard(f'{title}') print('') - if selection[0] == 'Default' and ask('Install LibreOffice?'): - menus['Install Software'].options['LibreOffice']['Selected'] = True + if selection[0] == 'Default': + if ask('Install LibreOffice?'): + menus['Install Software'].options['LibreOffice']['Selected'] = True + if ask('Install ESET NOD32 AV?'): + option = 'ESET NOD32 AV' + if ask(' Use MSP settings?'): + option = f'{option} (MSP)' + menus['Install Software'].options[option]['Selected'] = True # Re-enable Main Menu action if disabled MENU_PRESETS.actions['Main Menu'].update({'Disabled':False, 'Hidden':False})