Removed switch containing interactive/noninteractive

I removed the switch containing interactive/noninteractive choices since the noninteractive option only cut down the amount of interactive prompts by 2, and I saw no value with keeping it. I also fixed the formatting of the code and it should be a bit more presentable now.
This commit is contained in:
Richard Newton 2018-03-06 20:31:11 -08:00 committed by GitHub
parent f30ac403de
commit c5214cfb2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -6,7 +6,7 @@ If (Test-Path "C:\Windows10Debloater") {
} }
Else { Else {
Write-Output "The folder 'C:\Windows10Debloater' doesn't exist. This folder will be used for storing logs created after the script runs. Creating now." Write-Output "The folder 'C:\Windows10Debloater' doesn't exist. This folder will be used for storing logs created after the script runs. Creating now."
Sleep 1 Start-Sleep 1
New-Item -Path "C:\Windows10Debloater" -ItemType Directory New-Item -Path "C:\Windows10Debloater" -ItemType Directory
} }
@ -345,16 +345,14 @@ Function FixWhitelistedApps {
Get-AppxPackage -allusers Microsoft.Paint3D | Foreach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"} Get-AppxPackage -allusers Microsoft.Paint3D | Foreach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
Get-AppxPackage -allusers Microsoft.WindowsCalculator | Foreach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"} Get-AppxPackage -allusers Microsoft.WindowsCalculator | Foreach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
Get-AppxPackage -allusers Microsoft.WindowsStore | Foreach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"} Get-AppxPackage -allusers Microsoft.WindowsStore | Foreach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
Get-AppxPackage -allusers Microsoft.Windows.Photos | Foreach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"} } } Get-AppxPackage -allusers Microsoft.Windows.Photos | Foreach {Add-AppxPackage -DisableDevelopmentMode -Register "$($_.InstallLocation)\AppXManifest.xml"}
}
}
#This switch will ask you if you'd like to run the script as interactive or silently. Depending on your selection, yes will be interactive, no will be silent.
Write-Output "How would you like to run this script?"
$ReadHost = Read-Host " ( Interactive / Noninteractive ) "
Switch ($ReadHost) {
Interactive {
#Switch statement containing Debloat/Revert options #Switch statement containing Debloat/Revert options
Write-Output "The following options will allow you to either Debloat Windows 10, or to revert changes made after Debloating Windows 10. Write-Output "The following options will allow you to either Debloat Windows 10, or to revert changes made after Debloating Windows 10.
Choose 'Debloat' to Debloat Windows 10 or choose 'Revert' to revert changes." Choose 'Debloat' to Debloat Windows 10 or choose 'Revert' to revert changes made by this script."
$Readhost = Read-Host " ( Debloat / Revert ) " $Readhost = Read-Host " ( Debloat / Revert ) "
Switch ($ReadHost) { Switch ($ReadHost) {
#This will debloat Windows 10 #This will debloat Windows 10
@ -362,23 +360,23 @@ Switch ($ReadHost) {
#Creates a "drive" to access the HKCR (HKEY_CLASSES_ROOT) #Creates a "drive" to access the HKCR (HKEY_CLASSES_ROOT)
Write-Output "Creating PSDrive 'HKCR' (HKEY_CLASSES_ROOT). This will be used for the duration of the script as it is necessary for the removal and modification of specific registry keys." Write-Output "Creating PSDrive 'HKCR' (HKEY_CLASSES_ROOT). This will be used for the duration of the script as it is necessary for the removal and modification of specific registry keys."
New-PSDrive -Name HKCR -PSProvider Registry -Root HKEY_CLASSES_ROOT New-PSDrive -Name HKCR -PSProvider Registry -Root HKEY_CLASSES_ROOT
Sleep 1 Start-Sleep 1
Write-Output "Uninstalling bloatware, please wait." Write-Output "Uninstalling bloatware, please wait."
Start-Debloat Start-Debloat
Write-Output "Bloatware removed." Write-Output "Bloatware removed."
Sleep 1 Start-Sleep 1
Write-Output "Removing specific registry keys." Write-Output "Removing specific registry keys."
Remove-Keys Remove-Keys
Write-Output "Leftover bloatware registry keys removed." Write-Output "Leftover bloatware registry keys removed."
Sleep 1 Start-Sleep 1
Write-Output "Checking to see if any Whitelisted Apps were removed, and if so re-adding them." Write-Output "Checking to see if any Whitelisted Apps were removed, and if so re-adding them."
Sleep 1 Start-Sleep 1
FixWhitelistedApps FixWhitelistedApps
Sleep 1 Start-Sleep 1
Write-Output "Disabling Cortana from search, disabling feedback to Microsoft, and disabling scheduled tasks that are considered to be telemetry or unnecessary." Write-Output "Disabling Cortana from search, disabling feedback to Microsoft, and disabling scheduled tasks that are considered to be telemetry or unnecessary."
Protect-Privacy Protect-Privacy
Write-Output "Cortana disabled from search, feedback to Microsoft has been disabled, and scheduled tasks are disabled." Write-Output "Cortana disabled from search, feedback to Microsoft has been disabled, and scheduled tasks are disabled."
Sleep 1; $PublishSettings = $Debloat Start-Sleep 1; $PublishSettings = $Debloat
Write-Output "Do you want to stop edge from taking over as the default PDF viewer?" Write-Output "Do you want to stop edge from taking over as the default PDF viewer?"
$ReadHost = Read-Host " (Yes / No ) " $ReadHost = Read-Host " (Yes / No ) "
@ -398,19 +396,19 @@ Switch ($ReadHost) {
Yes { Yes {
Write-Output "Unloading the HKCR drive..." Write-Output "Unloading the HKCR drive..."
Remove-PSDrive HKCR Remove-PSDrive HKCR
Sleep 1 Start-Sleep 1
Stop-Transcript Stop-Transcript
Write-Output "Initiating reboot." Write-Output "Initiating reboot."
Sleep 2 Start-Sleep 2
Restart-Computer; $PublishSettings = $Yes Restart-Computer; $PublishSettings = $Yes
} }
No { No {
Write-Output "Unloading the HKCR drive..." Write-Output "Unloading the HKCR drive..."
Remove-PSDrive HKCR Remove-PSDrive HKCR
Sleep 1 Start-Sleep 1
Stop-Transcript Stop-Transcript
Write-Output "Script has finished. Exiting." Write-Output "Script has finished. Exiting."
Sleep 2 Start-Sleep 2
Exit; $PublishSettings = $No Exit; $PublishSettings = $No
} }
} }
@ -436,67 +434,21 @@ Switch ($ReadHost) {
Yes { Yes {
Write-Output "Unloading the HKCR drive..." Write-Output "Unloading the HKCR drive..."
Remove-PSDrive HKCR Remove-PSDrive HKCR
Sleep 1 Start-Sleep 1
Write-Output "Initiating reboot." Write-Output "Initiating reboot."
Stop-Transcript Stop-Transcript
Sleep 2 Start-Sleep 2
Restart-Computer; $PublishSettings = $Yes Restart-Computer; $PublishSettings = $Yes
} }
No { No {
Write-Output "Unloading the HKCR drive..." Write-Output "Unloading the HKCR drive..."
Remove-PSDrive HKCR Remove-PSDrive HKCR
Sleep 1 Start-Sleep 1
Write-Output "Script has finished. Exiting." Write-Output "Script has finished. Exiting."
Stop-Transcript Stop-Transcript
Sleep 2 Start-Sleep 2
Exit; $PublishSettings = $No Exit; $PublishSettings = $No
} }
} }
} }
} }
}
Noninteractive {
Write-Output "You will not be prompted for any other questions after this. With either option your machine will not automatically reboot and you will need to manually reboot. Would you like to Debloat or Revert changes?"
$Readhost = Read-Host " ( Debloat / Revert ) "
Switch ($ReadHost) {
Debloat {
Write-Output "Uninstalling bloatware. Please wait."
Start-Debloat
Write-Output "Removing leftover bloatware registry keys."
Sleep 1
Remove-Keys
Sleep 1
Write-Output "Checking to see if any Whitelisted Apps were removed, and if so re-adding them."
Sleep 1
FixWhitelistedApps
Sleep 1
Write-Output "Stopping Edge from being used as the default PDF Viewer."
Sleep 1
Protect-Privacy
Write-Output "Script has finished. Exiting now."
Sleep 2
Stop-Transcript
Exit; $PublishSettings = $Debloat
}
Revert {
Write-Output "Reverting changes..."
Write-Output "Creating PSDrive 'HKCR' (HKEY_CLASSES_ROOT). This will be used for the duration of the script as it is necessary for the modification of specific registry keys."
New-PSDrive -Name HKCR -PSProvider Registry -Root HKEY_CLASSES_ROOT
Write-Output "Reinstalling bloatware. Please wait."
Revert-Changes
Write-Output "Bloatware has been reinstalled."
Write-Output "Setting Edge back to being the default PDF Viewer."
Sleep 1
Enable-EdgePDF
Write-Output "Edge has been set back to being the default PDF Viewer"
Write-Output "Unloading the HKCR drive..."
Remove-PSDrive HKCR
Sleep 1
Write-Output "Script has finished. Exiting now."
Stop-Transcript
Sleep 2
Exit; $PublishSettings = $Revert
}
}
}
}