2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Made Ninite optional in install_sw_bundle

Browse source
This commit is contained in:
Alan Mason 2017-11-22 20:58:42 -08:00
parent 38cb129add
commit 9977ddf365
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.bin/Scripts/functions/setup.py
View file

@ -108,13 +108,14 @@ VCR_REDISTS = [
'/passive', '/norestart']}, '/passive', '/norestart']},
{'Name': 'Visual C++ 2015 Update 3 x64...', {'Name': 'Visual C++ 2015 Update 3 x64...',
'Cmd': [r'2015u3\x64\vcredist.exe', '/install', 'Cmd': [r'2015u3\x64\vcredist.exe', '/install',
'/passive', '/norestart']}] '/passive', '/norestart']},
{'Name': 'Visual C++ 2017 x32...', {'Name': 'Visual C++ 2017 x32...',
'Cmd': [r'2017\x32\vcredist.exe', '/install', 'Cmd': [r'2017\x32\vcredist.exe', '/install',
'/passive', '/norestart']}, '/passive', '/norestart']},
{'Name': 'Visual C++ 2017 x64...', {'Name': 'Visual C++ 2017 x64...',
'Cmd': [r'2017\x64\vcredist.exe', '/install', 'Cmd': [r'2017\x64\vcredist.exe', '/install',
'/passive', '/norestart']}] '/passive', '/norestart']},
]
def config_classicstart(): def config_classicstart():
"""Configure ClassicStart.""" """Configure ClassicStart."""

8
.bin/Scripts/install_sw_bundle.py
View file

@ -27,7 +27,8 @@ if __name__ == '__main__':
answer_extensions = ask('Install Extensions?') answer_extensions = ask('Install Extensions?')
answer_adobe_reader = ask('Install Adobe Reader?') answer_adobe_reader = ask('Install Adobe Reader?')
answer_vcr = ask('Install Visual C++ Runtimes?') 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 # Vista is dead, not going to check for it
answer_mse = ask('Install MSE?') answer_mse = ask('Install MSE?')
else: else:
@ -47,8 +48,9 @@ if __name__ == '__main__':
install_adobe_reader() install_adobe_reader()
if answer_vcr: if answer_vcr:
install_vcredists() install_vcredists()
try_and_print(message='Ninite bundle...', if answer_ninite:
function=install_ninite_bundle, cs='Started', mse=answer_mse) try_and_print(message='Ninite bundle...',
function=install_ninite_bundle, cs='Started', mse=answer_mse)
print_standard('\nDone.') print_standard('\nDone.')
exit_script() exit_script()
except SystemExit: except SystemExit: