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

Simplified ninite section

Browse source
This commit is contained in:
2Shirt 2019-11-16 14:56:42 -07:00
parent b9e99ac4d8
commit 11401513e2
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -361,16 +361,14 @@ def install_ninite_bundle(
# Main selections # Main selections
main_selections = [] main_selections = []
if base: if base and standard:
if global_vars['OS']['Version'] in ('8', '8.1', '10'): main_selections.append('base-standard')
main_selections.append('base') elif base:
else: main_selections.append('base')
main_selections.append('base7') elif standard:
if standard: main_selections.append('standard')
if global_vars['OS']['Version'] in ('8', '8.1', '10'): if global_vars['OS']['Version'] not in ('8', '8.1', '10'):
main_selections.append('standard') main_selections = [f'{s}7' for s in main_selections]
else:
main_selections.append('standard7')
if main_selections: if main_selections:
# Only run if base and/or standard are enabled # Only run if base and/or standard are enabled
cmd = r'{}\Installers\Extras\Bundles\{}.exe'.format( cmd = r'{}\Installers\Extras\Bundles\{}.exe'.format(