diff --git a/.bin/Scripts/functions/setup.py b/.bin/Scripts/functions/setup.py index 7d7722fd..84976888 100644 --- a/.bin/Scripts/functions/setup.py +++ b/.bin/Scripts/functions/setup.py @@ -108,13 +108,14 @@ VCR_REDISTS = [ '/passive', '/norestart']}, {'Name': 'Visual C++ 2015 Update 3 x64...', 'Cmd': [r'2015u3\x64\vcredist.exe', '/install', - '/passive', '/norestart']}] + '/passive', '/norestart']}, {'Name': 'Visual C++ 2017 x32...', 'Cmd': [r'2017\x32\vcredist.exe', '/install', '/passive', '/norestart']}, {'Name': 'Visual C++ 2017 x64...', 'Cmd': [r'2017\x64\vcredist.exe', '/install', - '/passive', '/norestart']}] + '/passive', '/norestart']}, + ] def config_classicstart(): """Configure ClassicStart.""" diff --git a/.bin/Scripts/install_sw_bundle.py b/.bin/Scripts/install_sw_bundle.py index e1498e82..d75a7ed6 100644 --- a/.bin/Scripts/install_sw_bundle.py +++ b/.bin/Scripts/install_sw_bundle.py @@ -27,7 +27,8 @@ if __name__ == '__main__': answer_extensions = ask('Install Extensions?') answer_adobe_reader = ask('Install Adobe Reader?') answer_vcr = ask('Install Visual C++ Runtimes?') - if global_vars['OS']['Version'] in ['7']: + answer_ninite = ask('Install Ninite Bundle?') + if answer_ninite and global_vars['OS']['Version'] in ['7']: # Vista is dead, not going to check for it answer_mse = ask('Install MSE?') else: @@ -47,8 +48,9 @@ if __name__ == '__main__': install_adobe_reader() if answer_vcr: install_vcredists() - try_and_print(message='Ninite bundle...', - function=install_ninite_bundle, cs='Started', mse=answer_mse) + if answer_ninite: + try_and_print(message='Ninite bundle...', + function=install_ninite_bundle, cs='Started', mse=answer_mse) print_standard('\nDone.') exit_script() except SystemExit: