From a953d81b9616a39410862245fde7e906df0f1c58 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Sun, 12 May 2019 15:37:59 -0600 Subject: [PATCH] Fix Ninite selections --- .bin/Scripts/system_setup.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.bin/Scripts/system_setup.py b/.bin/Scripts/system_setup.py index 3dfec639..1dc61864 100644 --- a/.bin/Scripts/system_setup.py +++ b/.bin/Scripts/system_setup.py @@ -134,18 +134,18 @@ SETUP_ACTION_KEYS = ( SETUP_QUESTIONS = { # AV 'ESET': {'New': None, 'Fab': None, 'Cur': None, 'HW': False}, - 'MSE': {'New': None, 'Fab': None, 'Cur': None, 'HW': False}, + 'MSE': {'New': None, 'Fab': None, 'Cur': None, 'HW': False, 'Ninite': True}, # Fast Startup / Hibernation 'Fast-Hiber': {'New': None, 'Fab': None, 'Cur': None, 'HW': False}, # LibreOffice - 'LibreOffice': {'New': None, 'Fab': None, 'Cur': None, 'HW': False}, + 'LibreOffice': {'New': None, 'Fab': None, 'Cur': None, 'HW': False, 'Ninite': True}, # Ninite - 'Base': {'New': True, 'Fab': True, 'Cur': True, 'HW': False}, - 'Missing': {'New': False, 'Fab': True, 'Cur': False, 'HW': False}, - 'Standard': {'New': True, 'Fab': True, 'Cur': False, 'HW': False}, + 'Base': {'New': True, 'Fab': True, 'Cur': True, 'HW': False, 'Ninite': True}, + 'Missing': {'New': False, 'Fab': True, 'Cur': False, 'HW': False, 'Ninite': True}, + 'Standard': {'New': True, 'Fab': True, 'Cur': False, 'HW': False, 'Ninite': True}, } # pylint: enable=bad-whitespace,line-too-long @@ -179,8 +179,11 @@ def get_actions(setup_mode, answers): _key = KIT_NAME_FULL _action['KWArgs'] = {'folder_path': global_vars['ClientDir']} elif _key == 'Ninite bundle': - _action['KWArgs'] = {kw.lower(): kv for kw, kv in answers.items()} - _action['KWArgs'].pop('eset', None) + # Add install_ninite_bundle() kwargs + _action['KWArgs'].update({ + kw.lower(): kv for kw, kv in answers.items() + if SETUP_QUESTIONS.get(kw, {}).get('Ninite', False) + }) # Add to dict actions[_key] = _action