Mirrors/Win11Debloat
1
0
Fork 0
mirror of https://github.com/Raphire/Win11Debloat.git synced 2025-11-17 11:06:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed minor issue when passing certain parameters at the same time

Browse Source
This commit is contained in:
Raphire
2023-09-29 02:39:56 +02:00
parent 20e96f0e39
commit 5bebe2866d
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Win11Debloat.ps1
View File

@@ -59,11 +59,11 @@ function RemoveApps {
$app = $app.Trim() $app = $app.Trim()
# Remove any comments from the Appname # Remove any comments from the Appname
if (-Not ($app.IndexOf('#') -eq -1)) { if (-not ($app.IndexOf('#') -eq -1)) {
$app = $app.Substring(0, $app.IndexOf('#')) $app = $app.Substring(0, $app.IndexOf('#'))
} }
# Remove any remaining spaces from the Appname # Remove any remaining spaces from the Appname
if (-Not ($app.IndexOf(' ') -eq -1)) { if (-not ($app.IndexOf(' ') -eq -1)) {
$app = $app.Substring(0, $app.IndexOf(' ')) $app = $app.Substring(0, $app.IndexOf(' '))
} }
@@ -145,7 +145,7 @@ function ClearStartMenu {
$defaultProfile = "C:\Users\default\AppData\Local\Packages\Microsoft.Windows.StartMenuExperienceHost_cw5n1h2txyewy\LocalState" $defaultProfile = "C:\Users\default\AppData\Local\Packages\Microsoft.Windows.StartMenuExperienceHost_cw5n1h2txyewy\LocalState"
# Create folder if it doesn't exist # Create folder if it doesn't exist
if(-Not(Test-Path $defaultProfile)) { if(-not(Test-Path $defaultProfile)) {
new-item $defaultProfile -ItemType Directory -Force | Out-Null new-item $defaultProfile -ItemType Directory -Force | Out-Null
Write-Output "Created LocalState folder for default user" Write-Output "Created LocalState folder for default user"
} }
@@ -166,7 +166,7 @@ foreach ($param in $SPParams) {
} }
# Change script execution based on provided parameters or user input # Change script execution based on provided parameters or user input
if ((-Not $PSBoundParameters.Count) -or $RunDefaults -or $RunWin11Defaults -or ($SPParamCount -eq $PSBoundParameters.Count)) { if ((-not $PSBoundParameters.Count) -or $RunDefaults -or $RunWin11Defaults -or ($SPParamCount -eq $PSBoundParameters.Count)) {
if ($RunDefaults -or $RunWin11Defaults) { if ($RunDefaults -or $RunWin11Defaults) {
$Mode = '1'; $Mode = '1';
} }
@@ -194,7 +194,7 @@ if ((-Not $PSBoundParameters.Count) -or $RunDefaults -or $RunWin11Defaults -or (
Write-Output "Press any key to go back..." Write-Output "Press any key to go back..."
$null = $Host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown") $null = $Host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown")
} }
elseif (-Not $Silent -and ($Mode -eq '1')) { elseif (-not $Silent -and ($Mode -eq '1')) {
Clear-Host Clear-Host
# Get & print default settings info from file # Get & print default settings info from file
@@ -217,17 +217,18 @@ if ((-Not $PSBoundParameters.Count) -or $RunDefaults -or $RunWin11Defaults -or (
Write-Output "-------------------------------------------------------------------------------------------" Write-Output "-------------------------------------------------------------------------------------------"
Write-Output " Win11Debloat Script - Default Configuration" Write-Output " Win11Debloat Script - Default Configuration"
Write-Output "-------------------------------------------------------------------------------------------" Write-Output "-------------------------------------------------------------------------------------------"
$PSBoundParameters.Add('RemoveApps', $RemoveApps)
$PSBoundParameters.Add('DisableTelemetry', $DisableTelemetry)
$PSBoundParameters.Add('DisableBing', $DisableBing)
$PSBoundParameters.Add('DisableLockscreenTips', $DisableLockscreenTips)
$PSBoundParameters.Add('DisableSuggestions', $DisableSuggestions)
$PSBoundParameters.Add('ShowKnownFileExt', $ShowKnownFileExt)
$PSBoundParameters.Add('DisableWidgets', $DisableWidgets)
$PSBoundParameters.Add('HideChat', $HideChat)
# Only add this option for windows 10 users # Add default parameters if they don't already exist
if (get-ciminstance -query "select caption from win32_operatingsystem where caption like '%Windows 10%'"){ $DefaultParameterNames = 'RemoveApps','DisableTelemetry','DisableBing','DisableLockscreenTips','DisableSuggestions','ShowKnownFileExt','DisableWidgets','HideChat'
foreach ($ParameterName in $DefaultParameterNames) {
if(-not $PSBoundParameters.ContainsKey($ParameterName)){
$PSBoundParameters.Add($ParameterName, $true)
}
}
# Only add this option for windows 10 users, if it doesn't already exist
if ((get-ciminstance -query "select caption from win32_operatingsystem where caption like '%Windows 10%'") -and (-not $PSBoundParameters.ContainsKey('Hide3dObjects'))) {
$PSBoundParameters.Add('Hide3dObjects', $Hide3dObjects) $PSBoundParameters.Add('Hide3dObjects', $Hide3dObjects)
} }
} }
@@ -410,7 +411,7 @@ if ((-Not $PSBoundParameters.Count) -or $RunDefaults -or $RunWin11Defaults -or (
} }
# Suppress prompt if Silent parameter was passed # Suppress prompt if Silent parameter was passed
if (-Not $Silent) { if (-not $Silent) {
Write-Output "" Write-Output ""
Write-Output "" Write-Output ""
Write-Output "" Write-Output ""
@@ -437,7 +438,7 @@ if ($SPParamCount -eq $PSBoundParameters.Keys.Count) {
Write-Output "The script completed without making any changes." Write-Output "The script completed without making any changes."
# Suppress prompt if Silent parameter was passed # Suppress prompt if Silent parameter was passed
if(-Not $Silent) { if(-not $Silent) {
Write-Output "" Write-Output ""
Write-Output "Press any key to exit..." Write-Output "Press any key to exit..."
$null = $Host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown") $null = $Host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown")
@@ -575,7 +576,7 @@ else {
Write-Output "Script completed successfully!" Write-Output "Script completed successfully!"
# Suppress prompt if Silent parameter was passed # Suppress prompt if Silent parameter was passed
if(-Not $Silent) { if(-not $Silent) {
Write-Output "" Write-Output ""
Write-Output "Press any key to exit..." Write-Output "Press any key to exit..."
$null = $Host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown") $null = $Host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown")