More bugfixes for reset_browser split

This commit is contained in:
2Shirt 2018-08-18 17:09:55 -07:00
parent b57374b177
commit 90a9751883
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
3 changed files with 1 additions and 9 deletions

View file

@ -150,7 +150,7 @@ def archive_browser(name):
"""Create backup of Browser saved in the BackupDir.""" """Create backup of Browser saved in the BackupDir."""
source = '{}*'.format(browser_data[name]['user_data_path']) source = '{}*'.format(browser_data[name]['user_data_path'])
dest = r'{BackupDir}\Browsers ({USERNAME})'.format( dest = r'{BackupDir}\Browsers ({USERNAME})'.format(
**global_vars, **env) **global_vars, **global_vars['Env'])
archive = r'{}\{}.7z'.format(dest, name) archive = r'{}\{}.7z'.format(dest, name)
os.makedirs(dest, exist_ok=True) os.makedirs(dest, exist_ok=True)
cmd = [ cmd = [

View file

@ -46,14 +46,7 @@ if __name__ == '__main__':
print_info('Resetting browsers') print_info('Resetting browsers')
reset_browsers() reset_browsers()
# Configure
print_info('Installing uBlock Origin')
install_adblock()
# Done # Done
if not D7_MODE:
print_standard('\nDone.')
pause('Press Enter to exit...')
exit_script() exit_script()
except SystemExit: except SystemExit:
pass pass

View file

@ -34,7 +34,6 @@ if __name__ == '__main__':
else: else:
answer_reset_browsers = ask( answer_reset_browsers = ask(
'Reset browsers to safe defaults first?') 'Reset browsers to safe defaults first?')
answer_reset_browsers = ask(
if global_vars['OS']['Version'] == '10': if global_vars['OS']['Version'] == '10':
#answer_config_classicshell = ask('Configure ClassicShell?') #answer_config_classicshell = ask('Configure ClassicShell?')
#answer_config_explorer_user = ask('Configure Explorer?') #answer_config_explorer_user = ask('Configure Explorer?')