Add -Wait to avoid race condition when OOSU is run together with temp file cleanup

config/ooshutup10_factory.cfg

@@ -0,0 +1,244 @@
+############################################################################
+# This file was created with O&O ShutUp10++ V1.9.1436
+# and can be imported onto another computer. 
+#
+# 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 the following parameter: 
+# OOSU10.exe <path to file>
+# 
+# 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!
+# © 2015-2023 O&O Software GmbH, Berlin. All rights reserved.
+# https://www.oo-software.com/
+############################################################################
+
+P001	-
+P002	-
+P003	-
+P004	-
+P005	-
+P006	-
+P008	-
+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	-
+P081	-
+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	-
+P071	-
+P072	-
+P073	-
+P074	-
+P075	-
+P076	-
+P077	-
+P078	-
+P079	-
+P080	-
+P024	-
+S001	-
+S002	-
+S003	-
+S008	-
+E101	-
+E201	-
+E115	-
+E215	-
+E118	-
+E218	-
+E107	-
+E207	-
+E111	-
+E211	-
+E112	-
+E212	-
+E109	-
+E209	-
+E121	-
+E221	-
+E103	-
+E203	-
+E123	-
+E223	-
+E124	-
+E224	-
+E128	-
+E228	-
+E119	-
+E219	-
+E120	-
+E220	-
+E122	-
+E222	-
+E125	-
+E225	-
+E126	-
+E226	-
+E106	-
+E206	-
+E127	-
+E227	-
+E001	-
+E002	-
+E003	-
+E008	-
+E007	-
+E010	-
+E011	+
+E012	+
+E009	-
+E004	-
+E005	-
+E013	-
+E014	-
+E006	-
+F002	-
+F014	-
+F015	-
+F016	-
+F001	-
+F003	-
+F004	-
+F005	-
+F007	-
+F008	-
+F009	-
+F006	-
+F010	-
+F011	-
+F012	-
+F013	-
+Y001	-
+Y002	-
+Y003	-
+Y004	-
+Y005	-
+Y006	-
+Y007	-
+C012	-
+C002	-
+C013	-
+C007	-
+C008	-
+C009	-
+C010	-
+C011	-
+C014	-
+C015	-
+C101	-
+C201	-
+C102	-
+L001	-
+L003	-
+L004	-
+L005	-
+U001	-
+U004	-
+U005	-
+U006	-
+U007	-
+W001	-
+W011	-
+W004	-
+W005	-
+W010	-
+W009	-
+P017	-
+W006	-
+W008	-
+M006	-
+M011	-
+M010	-
+O003	-
+O001	-
+S012	-
+S013	-
+S014	-
+K001	-
+K002	-
+K005	-
+M025	-
+M003	-
+M015	-
+M016	-
+M017	-
+M018	-
+M019	-
+M020	-
+M021	-
+M022	-
+M001	-
+M004	-
+M005	-
+M024	-
+M012	-
+M013	-
+M014	-
+N001	-

config/ooshutup10_recommended.cfg

@@ -1,5 +1,5 @@
 ############################################################################
-# This file was created with O&O ShutUp10++ V1.9.1435
+# This file was created with O&O ShutUp10++ V1.9.1436
 # and can be imported onto another computer. 
 #
 # Download the application at https://www.oo-software.com/shutup10
@@ -35,21 +35,21 @@ P070	+
 P069	+
 P009	-
 P010	-
-P015	+
+P015	-
 P068	-
 P016	-
 A001	+
 A002	+
 A003	+
-A004	-
+A004	+
-A006	-
+A006	+
 A005	+
 P007	+
 P036	+
 P025	+
 P033	+
 P023	+
-P056	+
+P056	-
 P057	-
 P012	-
 P034	-
@@ -108,29 +108,29 @@ S002	+
 S003	+
 S008	-
 E101	+
-E201	-
+E201	+
 E115	+
-E215	-
+E215	+
 E118	+
-E218	-
+E218	+
 E107	+
-E207	-
+E207	+
 E111	+
-E211	-
+E211	+
 E112	+
 E212	+
 E109	+
 E209	+
 E121	+
-E221	-
+E221	+
-E103	-
+E103	+
-E203	-
+E203	+
-E123	-
+E123	+
 E223	+
-E124	-
+E124	+
-E224	-
+E224	+
-E128	-
+E128	+
-E228	-
+E228	+
 E119	-
 E219	-
 E120	-
@@ -147,10 +147,10 @@ E127	-
 E227	-
 E001	+
 E002	+
-E003	-
+E003	+
 E008	+
 E007	+
-E010	-
+E010	+
 E011	+
 E012	+
 E009	-
@@ -159,6 +159,22 @@ E005	-
 E013	-
 E014	-
 E006	-
+F002	+
+F014	+
+F015	+
+F016	+
+F001	+
+F003	+
+F004	+
+F005	+
+F007	+
+F008	+
+F009	+
+F006	-
+F010	-
+F011	-
+F012	-
+F013	-
 Y001	+
 Y002	+
 Y003	+
@@ -175,6 +191,10 @@ C009	+
 C010	+
 C011	+
 C014	+
+C015	+
+C101	+
+C201	+
+C102	+
 L001	+
 L003	+
 L004	-
@@ -182,7 +202,7 @@ L005	-
 U001	+
 U004	+
 U005	+
-U006	-
+U006	+
 U007	+
 W001	+
 W011	+
@@ -190,12 +210,12 @@ W004	-
 W005	-
 W010	-
 W009	-
-P017	+
+P017	-
 W006	-
 W008	-
 M006	+
 M011	-
-M010	+
+M010	-
 O003	-
 O001	-
 S012	-
@@ -204,19 +224,21 @@ S014	-
 K001	+
 K002	+
 K005	+
+M025	+
+M003	-
+M015	-
+M016	-
+M017	-
+M018	-
+M019	-
+M020	-
+M021	-
 M022	+
 M001	+
 M004	+
 M005	+
-M024	-
+M024	+
-M003	-
 M012	-
 M013	-
 M014	-
-M015	+
-M017	+
-M018	+
-M019	-
-M020	+
-M021	-
 N001	-

config/tweaks.json

@@ -2234,19 +2234,18 @@
       "
     ]
   },
-  "WPFTweaksOO": {
+  "WPFTweaksOOSU": {
     "Content": "Run OO Shutup",
-    "Description": "Runs OO Shutup from https://www.oo-software.com/en/shutup10",
+    "Description": "Runs OO Shutup and applies the recommended Tweaks. https://www.oo-software.com/en/shutup10",
     "category": "Essential Tweaks",
     "panel": "1",
     "Order": "a002_",
-    "Content": "Run OO Shutup",
+    "ToolTip": "Runs OO Shutup and applies the recommended Tweaks https://www.oo-software.com/en/shutup10",
-    "ToolTip": "Runs OO Shutup from https://www.oo-software.com/en/shutup10",
     "InvokeScript": [
-      "curl.exe -s \"https://raw.githubusercontent.com/ChrisTitusTech/winutil/main/ooshutup10_winutil_settings.cfg\" -o $ENV:temp\\ooshutup10.cfg
+      "Invoke-WPFOOSU -action \"recommended\""
-       curl.exe -s \"https://dl5.oo-software.com/files/ooshutup10/OOSU10.exe\" -o $ENV:temp\\OOSU10.exe
+    ],
-       Start-Process $ENV:temp\\OOSU10.exe -ArgumentList \"\"\"$ENV:temp\\ooshutup10.cfg\"\" /quiet\"
+    "UndoScript": [
-       "
+      "Invoke-WPFOOSU -action \"undo\""
     ]
   },
   "WPFTweaksStorage": {
@@ -2613,6 +2612,13 @@
     "Order": "a067_",
     "Type": "Toggle"
   },
+  "WPFOOSUbutton": {
+    "Content": "Customize OO Shutup Tweaks",
+    "category": "z__Advanced Tweaks - CAUTION",
+    "panel": "1",
+    "Order": "a039_",
+    "Type": "220"
+  },
   "WPFchangedns": {
     "Content": "DNS",
     "category": "z__Advanced Tweaks - CAUTION",

functions/public/Invoke-WPFButton.ps1

@@ -27,6 +27,7 @@ function Invoke-WPFButton {
         "WPFclear" {Invoke-WPFPresets -preset $null -imported $true}
         "WPFclearWinget" {Invoke-WPFPresets -preset $null -imported $true -CheckBox "WPFInstall"}
         "WPFtweaksbutton" {Invoke-WPFtweaksbutton}
+        "WPFOOSUbutton" {Invoke-WPFOOSU -action "customize"}
         "WPFAddUltPerf" {Invoke-WPFUltimatePerformance -State "Enabled"}
         "WPFRemoveUltPerf" {Invoke-WPFUltimatePerformance -State "Disabled"}
         "WPFundoall" {Invoke-WPFundoall}

functions/public/Invoke-WPFOOSU

@@ -0,0 +1,43 @@
+function Invoke-WPFOOSU {
+    <#
+    .SYNOPSIS
+        Downloads and runs OO Shutup 10 with or without config files
+    .PARAMETER action
+        Specifies how OOSU should be started
+        customize:      Opens the OOSU GUI
+        recommended:    Loads and applies the recommended OOSU policies silently
+        undo:           Resets all policies to factory silently
+    #>
+
+    param (
+        [ValidateSet("customize", "recommended", "undo")]
+        [string]$action
+    )
+
+    $OOSU_filepath = "$ENV:temp\OOSU10.exe"
+
+    $Initial_ProgressPreference = $ProgressPreference
+    $ProgressPreference = "SilentlyContinue" # Disables the Progress Bar to drasticly speed up Invoke-WebRequest
+    Invoke-WebRequest -Uri "https://dl5.oo-software.com/files/ooshutup10/OOSU10.exe" -OutFile $OOSU_filepath
+
+    switch ($action) 
+    {
+        "customize"{
+            Write-Host "Starting OO Shutup 10 ..."
+            Start-Process $OOSU_filepath
+        }
+        "recommended"{
+            $oosu_config = "$ENV:temp\ooshutup10_recommended.cfg"
+            Invoke-WebRequest -Uri "https://raw.githubusercontent.com/ChrisTitusTech/winutil/main/config/recommended_ooshutup10.cfg" -OutFile $oosu_config
+            Write-Host "Applying recommended OO Shutup 10 Policies"
+            Start-Process $OOSU_filepath -ArgumentList "$oosu_config /quiet" -Wait
+        }
+        "undo"{
+            $oosu_config = "$ENV:temp\ooshutup10_factory.cfg"
+            Invoke-WebRequest -Uri "https://raw.githubusercontent.com/ChrisTitusTech/winutil/main/config/factory_ooshutup10.cfg" -OutFile $oosu_config
+            Write-Host "Resetting all OO Shutup 10 Policies"
+            Start-Process $OOSU_filepath -ArgumentList "$oosu_config /quiet" -Wait
+        }
+    }
+    $ProgressPreference = $Initial_ProgressPreference
+}