Add ShutUp 10 sections

scripts/auto_setup.py

@@ -121,7 +121,7 @@ BASE_MENUS = {
       MenuEntry('Configure Browsers',       'auto_config_browsers'),
       MenuEntry('Open Shell',               'auto_config_open_shell'),
       MenuEntry('Disable Fast Startup',     'auto_disable_fast_startup', selected=False),
-      #MenuEntry('Disable Telemetry',        no_op), # O&O ShutUp 10
+      MenuEntry('Disable Telemetry',        'auto_shutup_10'),
       MenuEntry('Enable BSoD MiniDumps',    'auto_enable_bsod_minidumps'),
       MenuEntry('Enable Hibernation',       'auto_enable_hibernation', selected=False),
       MenuEntry('Enable RegBack',           'auto_enable_regback'),

scripts/wk/setup/win.py

@@ -745,6 +745,11 @@ def auto_show_storage_status():
   TRY_PRINT.run('Storage Status...', get_storage_status)
 
 
+def auto_shutup_10():
+  """Disable Windows telemetry using O&O ShutUp 10."""
+  TRY_PRINT.run('Disable Telemetry...', run_shutup_10)
+
+
 def auto_windows_temp_fix():
   """Restore default ACLs for Windows\\Temp."""
   TRY_PRINT.run(r'Windows\Temp fix...', fix_windows_temp)
@@ -1167,5 +1172,10 @@ def open_xmplay():
   run_tool('XMPlay', 'XMPlay', 'music.7z', cbin=True, cwd=True, popen=True)
 
 
+def run_shutup_10():
+  """Disable Windows telemetry using O&O ShutUp 10."""
+  run_tool('ShutUp10', 'OOSU10', '1201.cfg', '/quiet', cbin=True, cwd=True)
+
+
 if __name__ == '__main__':
   print("This file is not meant to be called directly.")

setup/windows/cbin/_include/ShutUp10/1201.cfg

@@ -1,7 +1,7 @@
 ############################################################################
 # 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
+# Download the application at https://www.oo-software.com/shutup10
 # You can then import the file from within the program. 
 #
 # Alternatively you can import it automatically over a command line. Simply use
@@ -12,7 +12,7 @@
 # get any feedback about the import.
 #
 # We are always happy to answer any questions you may have!
-# Copyright © O&O Software GmbH https://www.oo-software.com/
+# © 2015-2021 O&O Software GmbH, Berlin. All rights reserved. https://www.oo-software.com/
 ############################################################################
 
 P001	+
@@ -26,44 +26,103 @@ P017	+
 P026	+
 P027	+
 P028	-
+P064	-
+P065	-
+P066	+
+P067	-
+P070	-
+P069	-
 P009	-
 P010	-
 P015	-
+P068	-
 P016	-
+A001	-
+A002	-
+A003	+
+A004	-
+A006	-
+A005	-
 P007	-
+P036	-
 P025	-
+P033	-
 P023	-
+P056	-
+P057	-
 P012	-
+P034	-
 P013	-
+P035	-
+P062	-
+P063	-
+P047	-
 P019	-
+P048	-
+P049	-
 P020	-
+P037	-
 P011	-
+P038	-
+P050	-
+P051	-
 P018	-
+P039	-
 P021	-
+P040	-
 P022	-
+P041	-
 P014	-
+P042	-
+P052	-
+P053	-
+P054	-
+P055	-
 P029	-
+P043	-
 P030	-
+P044	-
 P031	-
+P045	-
 P032	-
+P046	-
+P058	-
+P059	-
+P060	-
+P061	-
 P024	-
 S001	-
 S002	-
 S003	+
-S004	+
-S005	+
 S008	-
-S009	-
-S010	-
+E101	+
+E115	-
+E116	-
+E117	-
+E118	-
+E107	-
+E111	-
+E112	-
+E109	-
+E121	-
+E103	-
+E119	-
+E120	-
+E122	-
+E106	-
 E001	+
 E002	-
 E003	-
 E008	-
 E007	-
 E010	-
+E011	-
+E012	-
 E009	-
 E004	-
 E005	-
+E013	-
+E014	-
 E006	-
 Y001	-
 Y002	-
@@ -74,36 +133,26 @@ Y006	-
 Y007	-
 C012	-
 C002	-
-C004	-
-C005	-
-C006	-
+C013	-
 C007	-
 C008	-
 C009	-
 C010	-
 C011	-
 L001	-
-L002	-
 L003	-
 L004	-
 L005	-
-L006	-
-L007	-
-L008	-
 U001	+
-U002	+
-U003	+
 U004	+
+U005	+
 W001	+
-W002	+
-W003	+
 W011	-
 W004	-
 W005	-
 W010	-
 W009	-
 W006	-
-W007	-
 W008	-
 M006	+
 M011	-
@@ -113,12 +162,10 @@ O001	-
 S012	+
 S013	+
 S014	+
-S011	-
 K001	-
 K002	+
 K005	-
 M001	+
-M002	+
 M004	+
 M005	+
 M003	-
@@ -127,4 +174,8 @@ M013	-
 M014	-
 M015	+
 M016	-
+M017	-
+M018	-
+M019	-
+M020	-
 N001	-