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

Include classic start in base group

Browse source
This commit is contained in:
2Shirt 2019-11-16 14:40:23 -07:00
parent 7f9f551b67
commit b9e99ac4d8
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -362,7 +362,10 @@ def install_ninite_bundle(
# Main selections # Main selections
main_selections = [] main_selections = []
if base: if base:
if global_vars['OS']['Version'] in ('8', '8.1', '10'):
main_selections.append('base') main_selections.append('base')
else:
main_selections.append('base7')
if standard: if standard:
if global_vars['OS']['Version'] in ('8', '8.1', '10'): if global_vars['OS']['Version'] in ('8', '8.1', '10'):
main_selections.append('standard') main_selections.append('standard')

3
.bin/Scripts/settings/sources.py
View file

@ -85,7 +85,8 @@ NINITE_REGEX = {
} }
NINITE_SOURCES = { NINITE_SOURCES = {
'Bundles': { 'Bundles': {
'base.exe': '.net4.8-7zip-vlc', 'base.exe': '.net4.8-7zip-classicstart-vlc',
'base7.exe': '.net4.8-7zip-vlc',
'base-standard.exe': '.net4.8-7zip-chrome-classicstart-firefox-sumatrapdf-vlc', 'base-standard.exe': '.net4.8-7zip-chrome-classicstart-firefox-sumatrapdf-vlc',
'base-standard7.exe': '.net4.8-7zip-chrome-firefox-sumatrapdf-vlc', 'base-standard7.exe': '.net4.8-7zip-chrome-firefox-sumatrapdf-vlc',
'standard.exe': 'chrome-classicstart-firefox-sumatrapdf', 'standard.exe': 'chrome-classicstart-firefox-sumatrapdf',

4
.bin/Scripts/system_setup.py
View file

@ -62,7 +62,7 @@ SETUP_ACTIONS = OrderedDict({
# Install extensions # Install extensions
'Installing Extensions': {'Info': True}, 'Installing Extensions': {'Info': True},
'Classic Shell skin': {'New': True, 'Dat': True, 'Cur': False, 'HW': False, 'Verf': False, 'Function': install_classicstart_skin, 'Win10 only': True,}, 'Classic Shell skin': {'New': True, 'Dat': True, 'Cur': True, 'HW': False, 'Verf': False, 'Function': install_classicstart_skin, 'Win10 only': True,},
'Chrome extensions': {'New': True, 'Dat': True, 'Cur': True, 'HW': False, 'Verf': False, 'Function': install_chrome_extensions,}, 'Chrome extensions': {'New': True, 'Dat': True, 'Cur': True, 'HW': False, 'Verf': False, 'Function': install_chrome_extensions,},
'Firefox extensions': {'New': True, 'Dat': True, 'Cur': True, 'HW': False, 'Verf': False, 'Function': install_firefox_extensions,}, 'Firefox extensions': {'New': True, 'Dat': True, 'Cur': True, 'HW': False, 'Verf': False, 'Function': install_firefox_extensions,},
@ -75,7 +75,7 @@ SETUP_ACTIONS = OrderedDict({
'Browser add-ons': {'New': True, 'Dat': True, 'Cur': True, 'HW': False, 'Verf': False, 'Function': install_adblock, 'Just run': True, 'Browser add-ons': {'New': True, 'Dat': True, 'Cur': True, 'HW': False, 'Verf': False, 'Function': install_adblock, 'Just run': True,
'Pause': 'Please enable uBlock Origin for all browsers', 'Pause': 'Please enable uBlock Origin for all browsers',
}, },
'Classic Start': {'New': True, 'Dat': True, 'Cur': False, 'HW': False, 'Verf': False, 'Function': config_classicstart, 'Win10 only': True,}, 'Classic Start': {'New': True, 'Dat': True, 'Cur': True, 'HW': False, 'Verf': False, 'Function': config_classicstart, 'Win10 only': True,},
'Config Windows Updates': {'New': True, 'Dat': True, 'Cur': True, 'HW': True, 'Verf': True, 'Function': config_windows_updates, 'Win10 only': True,}, 'Config Windows Updates': {'New': True, 'Dat': True, 'Cur': True, 'HW': True, 'Verf': True, 'Function': config_windows_updates, 'Win10 only': True,},
'Enable System Restore': {'New': True, 'Dat': True, 'Cur': True, 'HW': True, 'Verf': True, 'Function': enable_system_restore,}, 'Enable System Restore': {'New': True, 'Dat': True, 'Cur': True, 'HW': True, 'Verf': True, 'Function': enable_system_restore,},
'Create System Restore': {'New': True, 'Dat': True, 'Cur': True, 'HW': True, 'Verf': False, 'Function': create_system_restore_point,}, 'Create System Restore': {'New': True, 'Dat': True, 'Cur': True, 'HW': True, 'Verf': False, 'Function': create_system_restore_point,},