From 8c3b6865e6fe882c73dd1f5e5557c5230ad05529 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Tue, 28 May 2019 00:04:40 -0600 Subject: [PATCH] Updated ESET NOD32 AV settings * Settings options are now standard or MSP --- .bin/Scripts/functions/setup.py | 4 +- .bin/Scripts/install_eset_nod32_av.py | 4 +- .bin/Scripts/system_setup.py | 9 +- ...-config-no-pup.xml => eset-config-msp.xml} | 219 +++++------------- .cbin/_include/ESETConfigs/eset-config.xml | 219 +++++------------- 5 files changed, 139 insertions(+), 316 deletions(-) rename .cbin/_include/ESETConfigs/{eset-config-no-pup.xml => eset-config-msp.xml} (90%) diff --git a/.bin/Scripts/functions/setup.py b/.bin/Scripts/functions/setup.py index dc8707f2..eb7c5251 100644 --- a/.bin/Scripts/functions/setup.py +++ b/.bin/Scripts/functions/setup.py @@ -238,11 +238,11 @@ def install_classicstart_skin(): shutil.copy(source, dest) -def install_eset_nod32_av(scan_pups=True): +def install_eset_nod32_av(msp=False): """Install ESET NOD32 AV with custom config.""" extract_item('ESETConfigs', silent=True) config_file = r'{BinDir}\ESETConfigs\{config_file}.xml'.format( - config_file='eset-config' if scan_pups else 'eset-config-no-pup', + config_file='eset-config-msp' if msp else 'eset-config', **global_vars) # Apply user configuration diff --git a/.bin/Scripts/install_eset_nod32_av.py b/.bin/Scripts/install_eset_nod32_av.py index fd7617bb..7a2509f7 100644 --- a/.bin/Scripts/install_eset_nod32_av.py +++ b/.bin/Scripts/install_eset_nod32_av.py @@ -16,8 +16,8 @@ if __name__ == '__main__': stay_awake() clear_screen() print_info('{}: Install ESET NOD32 AV\n'.format(KIT_NAME_FULL)) - scan_pups = ask('Enable PUP scans in ESET?') - install_eset_nod32_av(scan_pups) + msp = ask('Use MSP settings (ITS/VIP)?') + install_eset_nod32_av(msp=msp) print_standard('\nDone.') exit_script() except SystemExit as sys_exit: diff --git a/.bin/Scripts/system_setup.py b/.bin/Scripts/system_setup.py index 39375570..9e871f73 100644 --- a/.bin/Scripts/system_setup.py +++ b/.bin/Scripts/system_setup.py @@ -1,5 +1,5 @@ '''Wizard Kit: System Setup''' -# pylint: disable=wildcard-import +# pylint: disable=wildcard-import,wrong-import-position # vim: sts=2 sw=2 ts=2 import os @@ -48,7 +48,7 @@ SETUP_ACTIONS = OrderedDict({ # Install software 'Installing Programs': {'Info': True}, 'VCR': {'New': True, 'Fab': True, 'Cur': True, 'HW': False, 'Function': install_vcredists, 'Just run': True,}, - 'ESET NOD32 AV': {'New': True, 'Fab': True, 'Cur': True, 'HW': False, 'Function': install_eset_nod32_av, 'If answer': 'ESET', 'KWArgs': {'scan_pups': False},}, + 'ESET NOD32 AV': {'New': True, 'Fab': True, 'Cur': True, 'HW': False, 'Function': install_eset_nod32_av, 'If answer': 'ESET', 'KWArgs': {'msp': False},}, 'LibreOffice': {'New': True, 'Fab': True, 'Cur': True, 'HW': False, 'Function': install_libreoffice, 'If answer': 'LibreOffice', 'KWArgs': {'quickstart': False, 'register_mso_types': True, 'use_mso_formats': True, 'vcredist': False}, }, @@ -274,6 +274,11 @@ def get_av_selection(): elif selection == 'Q': abort() + # ESET settings + if av_answers['ESET'] and ask(' Use MSP settings (ITS/VIP)?'): + # NOTE: There's probably a better way than updating a static var... + SETUP_ACTIONS['ESET NOD32 AV']['KWArgs']['msp'] = True + return av_answers diff --git a/.cbin/_include/ESETConfigs/eset-config-no-pup.xml b/.cbin/_include/ESETConfigs/eset-config-msp.xml similarity index 90% rename from .cbin/_include/ESETConfigs/eset-config-no-pup.xml rename to .cbin/_include/ESETConfigs/eset-config-msp.xml index ac4e010e..36d01521 100644 --- a/.cbin/_include/ESETConfigs/eset-config-no-pup.xml +++ b/.cbin/_include/ESETConfigs/eset-config-msp.xml @@ -1,6 +1,31 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -11,7 +36,7 @@ - + @@ -125,6 +150,10 @@ + + + + @@ -145,10 +174,6 @@ - - - - @@ -238,6 +263,7 @@ + @@ -255,11 +281,19 @@ - + - - - + + + + + + + + + + + @@ -269,10 +303,10 @@ - - - - + + + + @@ -335,6 +369,9 @@ + + + @@ -394,28 +431,7 @@ - - - - - - - - - - - - - - - - - - - - - - + @@ -471,7 +487,6 @@ - @@ -507,59 +522,23 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -568,24 +547,10 @@ - - - - - - - - - - - - - - @@ -642,7 +607,7 @@ - + @@ -669,28 +634,6 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -729,14 +672,9 @@ - + - - - - - @@ -768,6 +706,7 @@ + @@ -784,14 +723,14 @@ - - - + + + - - - + + + @@ -942,7 +881,7 @@ - + @@ -1462,7 +1401,7 @@ - + @@ -1633,36 +1572,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.cbin/_include/ESETConfigs/eset-config.xml b/.cbin/_include/ESETConfigs/eset-config.xml index 31804d40..772c6a03 100644 --- a/.cbin/_include/ESETConfigs/eset-config.xml +++ b/.cbin/_include/ESETConfigs/eset-config.xml @@ -1,6 +1,31 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -11,7 +36,7 @@ - + @@ -125,6 +150,10 @@ + + + + @@ -145,10 +174,6 @@ - - - - @@ -238,6 +263,7 @@ + @@ -255,11 +281,19 @@ - + - - - + + + + + + + + + + + @@ -269,10 +303,10 @@ - - - - + + + + @@ -335,6 +369,9 @@ + + + @@ -394,28 +431,7 @@ - - - - - - - - - - - - - - - - - - - - - - + @@ -471,7 +487,6 @@ - @@ -507,59 +522,23 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -568,24 +547,10 @@ - - - - - - - - - - - - - - @@ -596,8 +561,8 @@ - - + + @@ -669,28 +634,6 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -732,11 +675,6 @@ - - - - - @@ -768,6 +706,7 @@ + @@ -784,14 +723,14 @@ - - - + + + - - - + + + @@ -942,7 +881,7 @@ - + @@ -1462,7 +1401,7 @@ - + @@ -1633,36 +1572,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -