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

Disabled speedtest in d7II mode, moved to Post-d7

Browse source 
* Also updated post_d7.py to use 2-space indentation
This commit is contained in:
2Shirt 2019-03-19 20:49:32 -06:00
parent a4f57787e7
commit df1706a8bf
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
2 changed files with 37 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
.bin/Scripts/post_d7.py
View file

@ -14,37 +14,42 @@ os.system('title {}: Post-d7II Work'.format(KIT_NAME_FULL))
set_log_file('Post-d7II Work.log') set_log_file('Post-d7II Work.log')
if __name__ == '__main__': if __name__ == '__main__':
try: try:
stay_awake() stay_awake()
clear_screen() clear_screen()
print_info('{}: Post-d7II Work\n'.format(KIT_NAME_FULL)) print_info('{}: Post-d7II Work\n'.format(KIT_NAME_FULL))
other_results = { other_results = {
'Warning': { 'Warning': {
'NotInstalledError': 'Not installed', 'NotInstalledError': 'Not installed',
'NoProfilesError': 'No profiles found', 'NoProfilesError': 'No profiles found',
}} }}
# Scan for Firefox browsers # Scan for Firefox browsers
print_info('Scanning for Firefox browsers') print_info('Scanning for Firefox browsers')
scan_for_browsers(just_firefox=True) scan_for_browsers(just_firefox=True)
# Install uBlock Origin # Install uBlock Origin
print_info('Installing uBlock Origin') print_info('Installing uBlock Origin')
install_adblock(just_firefox=True) install_adblock(just_firefox=True)
# Cleanup # Cleanup
print_info('Cleanup') print_info('Cleanup')
try_and_print(message='d7II...', try_and_print(message='d7II...',
function=cleanup_d7ii, cs='Done') function=cleanup_d7ii, cs='Done')
try_and_print(message='{}...'.format(KIT_NAME_FULL), try_and_print(message='{}...'.format(KIT_NAME_FULL),
function=delete_empty_folders, cs='Done', function=delete_empty_folders, cs='Done',
folder_path=global_vars['ClientDir']) folder_path=global_vars['ClientDir'])
# Done # Run speedtest
print_standard('\nDone.') popen_program(['start', '', 'https://fast.com'], shell=True)
pause('Press Enter to exit...')
exit_script() # Done
except SystemExit: print_standard('\nDone.')
pass pause('Press Enter to exit...')
except: exit_script()
major_exception() except SystemExit:
pass
except:
major_exception()
# vim: sts=2 sw=2 ts=2

3
.bin/Scripts/user_checklist.py
View file

@ -85,7 +85,8 @@ if __name__ == '__main__':
function=restart_explorer, cs='Done') function=restart_explorer, cs='Done')
# Run speedtest # Run speedtest
popen_program(['start', '', 'https://fast.com'], shell=True) if not D7_MODE:
popen_program(['start', '', 'https://fast.com'], shell=True)
# Done # Done
if not D7_MODE: if not D7_MODE: