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

Skip Firefox during d7II

Browse source 
* Fixes issue #78
This commit is contained in:
2Shirt 2019-04-25 20:41:41 -07:00
parent d9e062ca7e
commit c7309ad381
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -319,11 +319,14 @@ def get_mozilla_profiles(search_path, dev=False):
return profiles return profiles
def install_adblock(indent=8, width=32, just_firefox=False): def install_adblock(
indent=8, width=32, just_firefox=False, skip_firefox=False):
"""Install adblock for all supported browsers.""" """Install adblock for all supported browsers."""
for browser in sorted(browser_data): for browser in sorted(browser_data):
if just_firefox and browser_data[browser]['base'] != 'mozilla': if just_firefox and browser_data[browser]['base'] != 'mozilla':
continue continue
if skip_firefox and browser_data[browser]['base'] == 'mozilla':
continue
exe_path = browser_data[browser].get('exe_path', None) exe_path = browser_data[browser].get('exe_path', None)
function=run_program function=run_program
if not exe_path: if not exe_path:

2
.bin/Scripts/user_checklist.py
View file

@ -64,7 +64,7 @@ if __name__ == '__main__':
# Configure # Configure
print_info('Configuring programs') print_info('Configuring programs')
if answer_config_browsers: if answer_config_browsers:
install_adblock() install_adblock(skip_firefox=D7_MODE)
if global_vars['OS']['Version'] == '10': if global_vars['OS']['Version'] == '10':
if answer_config_classicshell: if answer_config_classicshell:
try_and_print(message='ClassicStart...', try_and_print(message='ClassicStart...',