From 2a1cc81e464d8e04a06b3376b503383c197208d2 Mon Sep 17 00:00:00 2001 From: 2Shirt <1923621+2Shirt@users.noreply.github.com> Date: Wed, 3 Oct 2018 20:06:41 -0600 Subject: [PATCH] Added O&O ShutUp10 --- .bin/Scripts/functions/setup.py | 9 +++ .bin/Scripts/functions/update.py | 26 +++++- .bin/Scripts/settings/launchers.py | 13 ++- .bin/Scripts/settings/sources.py | 1 + .bin/Scripts/system_checklist.py | 2 + .bin/Scripts/update_kit.py | 3 +- .cbin/_include/ShutUp10/1201.cfg | 124 +++++++++++++++++++++++++++++ 7 files changed, 169 insertions(+), 9 deletions(-) create mode 100644 .cbin/_include/ShutUp10/1201.cfg diff --git a/.bin/Scripts/functions/setup.py b/.bin/Scripts/functions/setup.py index a33672d9..af5b3791 100644 --- a/.bin/Scripts/functions/setup.py +++ b/.bin/Scripts/functions/setup.py @@ -203,6 +203,15 @@ def config_explorer_user(): """Configure Windows Explorer for current user via Registry settings.""" write_registry_settings(SETTINGS_EXPLORER_USER, all_users=False) +def config_privacy_settings(): + """Configure Windows 10 privacy settings with O&O ShutUp10.""" + extract_item('ShutUp10', silent=True) + cmd = [ + r'{BinDir}\ShutUp10\OOSU10.exe'.format(**global_vars), + r'{BinDir}\ShutUp10\1201.cfg'.format(**global_vars), + '/quiet'] + run_program(cmd) + def enable_system_restore(): """Enable System Restore and set disk usage to 5%""" cmd = [ diff --git a/.bin/Scripts/functions/update.py b/.bin/Scripts/functions/update.py index 35ed1255..c7b30474 100644 --- a/.bin/Scripts/functions/update.py +++ b/.bin/Scripts/functions/update.py @@ -414,7 +414,7 @@ def update_furmark(): # Remove existing folders remove_from_kit('FurMark') - + # Prep install_dir = r'{}\FurMarkTemp"'.format(global_vars['TmpDir']) dest = r'{}\FurMark'.format(global_vars['CBinDir']) @@ -422,14 +422,14 @@ def update_furmark(): # Download download_to_temp('furmark_setup.exe', SOURCE_URLS['FurMark']) - + # Install to temp cmd = [ r'{}\furmark_setup.exe'.format(global_vars['TmpDir']), '/DIR="{}"'.format(install_dir), '/SILENT'] run_program(cmd) - + # Copy files shutil.copytree(install_dir, dest) for item in os.scandir(dest): @@ -438,7 +438,7 @@ def update_furmark(): if 'exe' in item.name: uninstaller = r'{}\{}'.format(dest, item.name) remove_item(item.path) - + # Uninstall from temp if uninstaller: cmd = [uninstaller, '/SILENT'] @@ -846,6 +846,24 @@ def update_putty(): # Cleanup remove_from_temp('putty.zip') +def update_shutup10(): + # Stop running processes + kill_process('OOSU10.exe') + + # Remove existing folders + remove_from_kit('ShutUp10') + + # Download + download_generic( + r'{}\ShutUp10'.format(global_vars['CBinDir']), + 'OOSU10.exe', + SOURCE_URLS['ShutUp10']) + + # Copy settings + include_path = r'{}\_include\ESETConfigs'.format(global_vars['CBinDir']) + if os.path.exists(include_path): + shutil.copytree(include_path, dest) + def update_wiztree(): # Stop running processes for process in ['WizTree.exe', 'WizTree64.exe']: diff --git a/.bin/Scripts/settings/launchers.py b/.bin/Scripts/settings/launchers.py index ddb3f132..34491575 100644 --- a/.bin/Scripts/settings/launchers.py +++ b/.bin/Scripts/settings/launchers.py @@ -523,17 +523,22 @@ LAUNCHERS = { 'L_PATH': 'PuTTY', 'L_ITEM': 'PUTTY.EXE', }, - 'WizTree': { + 'ShutUp10': { 'L_TYPE': 'Executable', - 'L_PATH': 'WizTree', - 'L_ITEM': 'WizTree.exe', - 'L_ELEV': 'True', + 'L_PATH': 'ShutUp10', + 'L_ITEM': 'OOSU10.exe', }, 'Update Kit': { 'L_TYPE': 'PyScript', 'L_PATH': 'Scripts', 'L_ITEM': 'update_kit.py', }, + 'WizTree': { + 'L_TYPE': 'Executable', + 'L_PATH': 'WizTree', + 'L_ITEM': 'WizTree.exe', + 'L_ELEV': 'True', + }, 'XMPlay': { 'L_TYPE': 'Executable', 'L_PATH': 'XMPlay', diff --git a/.bin/Scripts/settings/sources.py b/.bin/Scripts/settings/sources.py index 6eb8e0d2..6bbe7e08 100644 --- a/.bin/Scripts/settings/sources.py +++ b/.bin/Scripts/settings/sources.py @@ -37,6 +37,7 @@ SOURCE_URLS = { 'Samsung Magician': 'https://s3.ap-northeast-2.amazonaws.com/global.semi.static/SAMSUNG_SSD_v5_2_1_180523/CD0CFAC4675B9E502899B41BE00525C3909ECE3AD57CC1A2FB6B74A766B2A1EA/Samsung_Magician_Installer.zip', 'SDIO Themes': 'http://snappy-driver-installer.org/downloads/SDIO_Themes.zip', 'SDIO Torrent': 'http://snappy-driver-installer.org/downloads/SDIO_Update.torrent', + 'ShutUp10': 'https://dl5.oo-software.com/files/ooshutup10/OOSU10.exe', 'TDSSKiller': 'https://media.kaspersky.com/utilities/VirusUtilities/EN/tdsskiller.exe', 'TestDisk': 'https://www.cgsecurity.org/testdisk-7.1-WIP.win.zip', 'wimlib32': 'https://wimlib.net/downloads/wimlib-1.12.0-windows-i686-bin.zip', diff --git a/.bin/Scripts/system_checklist.py b/.bin/Scripts/system_checklist.py index 04fac9a0..910b44f7 100644 --- a/.bin/Scripts/system_checklist.py +++ b/.bin/Scripts/system_checklist.py @@ -45,6 +45,8 @@ if __name__ == '__main__': if global_vars['OS']['Version'] == '10': try_and_print(message='Explorer...', function=config_explorer_system, cs='Done') + try_and_print(message='Privacy...', + function=config_privacy_settings, cs='Done') try_and_print(message='Updating Clock...', function=update_clock, cs='Done') try_and_print(message='Enabling System Restore...', diff --git a/.bin/Scripts/update_kit.py b/.bin/Scripts/update_kit.py index 88489181..945a473f 100644 --- a/.bin/Scripts/update_kit.py +++ b/.bin/Scripts/update_kit.py @@ -72,6 +72,7 @@ if __name__ == '__main__': try_and_print(message='Everything...', function=update_everything, other_results=other_results, width=40) try_and_print(message='FirefoxExtensions...', function=update_firefox_ublock_origin, other_results=other_results, width=40) try_and_print(message='PuTTY...', function=update_putty, other_results=other_results, width=40) + try_and_print(message='ShutUp10...', function=update_shutup10, other_results=other_results, width=40) try_and_print(message='Notepad++...', function=update_notepadplusplus, other_results=other_results, width=40) try_and_print(message='WizTree...', function=update_wiztree, other_results=other_results, width=40) try_and_print(message='XMPlay...', function=update_xmplay, other_results=other_results, width=40) @@ -83,7 +84,7 @@ if __name__ == '__main__': try_and_print(message='RKill...', function=update_rkill, other_results=other_results, width=40) try_and_print(message='TDSSKiller...', function=update_tdsskiller, other_results=other_results, width=40) try_and_print(message='WinAIO Repair...', function=update_winaiorepair, other_results=other_results, width=40) - + # Uninstallers print_info(' Uninstallers') try_and_print(message='IObit Uninstaller...', function=update_iobit_uninstaller, other_results=other_results, width=40) diff --git a/.cbin/_include/ShutUp10/1201.cfg b/.cbin/_include/ShutUp10/1201.cfg new file mode 100644 index 00000000..d3d6c67e --- /dev/null +++ b/.cbin/_include/ShutUp10/1201.cfg @@ -0,0 +1,124 @@ +############################################################################ +# This file was created with O&O ShutUp10 and can be imported onto another computer. +# +# Download the application at https://www.oo-software.com/en/shutup10 +# You can then import the file from within the program. +# +# Alternatively you can import it automatically over a command line. Simply use +# the following parameter: +# ooshutup10.exe +# +# Selecting the Option /quiet ends the app right after the import and the user does not +# get any feedback about the import. +# +# We are always happy to answer any questions you may have! +# (c) 2015-2018 O&O Software GmbH, Berlin. https://www.oo-software.com/ +############################################################################ + +P001 + +P002 + +P003 + +P004 - +P005 + +P006 + +P008 + +P017 + +P026 + +P027 + +P028 - +P009 - +P010 - +P015 - +P016 - +P007 - +P025 - +P023 - +P012 - +P013 - +P019 - +P020 - +P011 - +P018 - +P021 - +P022 - +P014 - +P029 - +P030 - +P031 - +P032 - +P024 - +S001 - +S002 - +S003 + +S004 + +S005 + +S008 - +S009 - +S010 - +E001 + +E002 - +E003 - +E007 - +E004 - +E005 - +E006 - +Y001 - +Y002 - +Y003 - +Y004 - +Y005 - +Y006 - +Y007 - +C012 - +C002 - +C004 - +C005 - +C006 - +C007 - +C008 - +C009 - +C010 - +C011 - +L001 - +L002 - +L003 - +L004 - +L005 - +L006 - +L007 - +L008 - +U001 + +U002 + +U003 + +U004 + +W001 + +W002 + +W003 + +W011 - +W004 - +W005 - +W010 - +W009 - +W006 - +W007 - +W008 - +M006 + +M011 - +M010 + +O003 - +O001 - +S012 + +S013 + +S014 + +S011 - +K001 - +K002 + +M001 + +M002 + +M003 + +M004 + +M005 + +M012 - +M013 - +M014 - +N001 -