diff --git a/Compile.ps1 b/Compile.ps1 index c296eb7f..80ca0729 100644 --- a/Compile.ps1 +++ b/Compile.ps1 @@ -64,13 +64,6 @@ Get-ChildItem .\config | Where-Object {$psitem.extension -eq ".json"} | ForEach- $sync.configs.$($psitem.BaseName) = $json | convertfrom-json $script_content.Add($(Write-output "`$sync.configs.$($psitem.BaseName) = '$json' `| convertfrom-json" )) } -Write-Progress -Activity "Compiling" -Status "Adding: Config *.cfg" -PercentComplete 45 -Get-ChildItem .\config | Where-Object {$PSItem.Extension -eq ".cfg"} | ForEach-Object { - $script_content.Add($(Write-output "`$sync.configs.$($psitem.BaseName) = '$(Get-Content $PSItem.FullName)'")) -} -Get-ChildItem .\config | Where-Object {$PSItem.Extension -eq ".cfg"} | ForEach-Object { - $script_content.Add($(Write-output "`$sync.configs.$($psitem.BaseName) = '$(Get-Content $PSItem.FullName)'")) -} $xaml = (Get-Content .\xaml\inputXML.xaml).replace("'","''") diff --git a/config/ooshutup10_factory.cfg b/config/ooshutup10_factory.cfg deleted file mode 100644 index 1ae2ecab..00000000 --- a/config/ooshutup10_factory.cfg +++ /dev/null @@ -1,227 +0,0 @@ -############################################################################ -# 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 -# -# 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 - -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 - -M003 - -M015 - -M016 - -M017 - -M018 - -M019 - -M020 - -M021 - -M022 - -M001 - -M004 - -M005 - -M024 - -M012 - -M013 - -M014 - -N001 - diff --git a/config/ooshutup10_recommended.cfg b/config/ooshutup10_recommended.cfg deleted file mode 100644 index 53284193..00000000 --- a/config/ooshutup10_recommended.cfg +++ /dev/null @@ -1,231 +0,0 @@ -############################################################################ -# This file was created with O&O ShutUp10++ V1.9.1438 -# 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 -# -# 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-2024 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 - -Y001 + -Y002 + -Y003 + -Y004 + -Y005 + -Y006 + -Y007 + -C012 + -C002 + -C013 + -C007 + -C008 + -C009 + -C010 + -C011 + -C014 + -C015 + -C101 + -C201 + -C102 + -C103 + -C203 + -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 + -M003 + -M015 + -M016 + -M017 - -M018 + -M019 - -M020 + -M021 + -M022 + -M001 + -M004 + -M005 + -M024 + -M026 + -M027 + -M012 - -M013 - -M014 - -N001 - \ No newline at end of file diff --git a/config/preset.json b/config/preset.json index cabe8037..d0640ce4 100644 --- a/config/preset.json +++ b/config/preset.json @@ -5,7 +5,6 @@ "WPFTweaksHiber", "WPFTweaksHome", "WPFTweaksLoc", - "WPFTweaksOO", "WPFTweaksServices", "WPFTweaksStorage", "WPFTweaksTele", @@ -18,7 +17,6 @@ ], "Minimal": [ "WPFTweaksHome", - "WPFTweaksOO", "WPFTweaksServices", "WPFTweaksTele" ] diff --git a/config/tweaks.json b/config/tweaks.json index 75672aad..d2c9dcf4 100644 --- a/config/tweaks.json +++ b/config/tweaks.json @@ -2308,20 +2308,6 @@ "Invoke-WPFTweakPS7 -action \"PS5\"" ] }, - "WPFTweaksOO": { - "Content": "Run OO Shutup", - "Description": "Runs OO Shutup and applies the recommended Tweaks. https://www.oo-software.com/en/shutup10", - "category": "Essential Tweaks", - "panel": "1", - "Order": "a009_", - "ToolTip": "Runs OO Shutup and applies the recommended Tweaks https://www.oo-software.com/en/shutup10", - "InvokeScript": [ - "Invoke-WPFOOSU -action \"recommended\"" - ], - "UndoScript": [ - "Invoke-WPFOOSU -action \"undo\"" - ] - }, "WPFTweaksStorage": { "Content": "Disable Storage Sense", "Description": "Storage Sense deletes temp files automatically.", @@ -3079,7 +3065,7 @@ "Type": "Toggle" }, "WPFOOSUbutton": { - "Content": "Customize OO Shutup Tweaks", + "Content": "Run OO Shutup 10", "category": "z__Advanced Tweaks - CAUTION", "panel": "1", "Order": "a039_", diff --git a/functions/public/Invoke-WPFButton.ps1 b/functions/public/Invoke-WPFButton.ps1 index 75ac3917..5ca1dc78 100644 --- a/functions/public/Invoke-WPFButton.ps1 +++ b/functions/public/Invoke-WPFButton.ps1 @@ -26,7 +26,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"} + "WPFOOSUbutton" {Invoke-WPFOOSU} "WPFAddUltPerf" {Invoke-WPFUltimatePerformance -State "Enabled"} "WPFRemoveUltPerf" {Invoke-WPFUltimatePerformance -State "Disabled"} "WPFundoall" {Invoke-WPFundoall} diff --git a/functions/public/Invoke-WPFOOSU.ps1 b/functions/public/Invoke-WPFOOSU.ps1 index 97f64e89..c47b04bf 100644 --- a/functions/public/Invoke-WPFOOSU.ps1 +++ b/functions/public/Invoke-WPFOOSU.ps1 @@ -1,43 +1,20 @@ 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 + Downloads and runs OO Shutup 10 #> - - 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" - $sync.configs.ooshutup10_recommended | Out-File -FilePath $oosu_config -Force - 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" - $sync.configs.ooshutup10_factory | Out-File -FilePath $oosu_config -Force - Write-Host "Resetting all OO Shutup 10 Policies" - Start-Process $OOSU_filepath -ArgumentList "$oosu_config /quiet" -Wait - } + try { + $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 + Write-Host "Starting OO Shutup 10 ..." + Start-Process $OOSU_filepath } - $ProgressPreference = $Initial_ProgressPreference -} + catch { + Write-Host "Error Downloading and Running OO Shutup 10" -ForegroundColor Red + } + finally { + $ProgressPreference = $Initial_ProgressPreference + } +} \ No newline at end of file