diff --git a/config/feature.json b/config/feature.json index 88670f98..21b7e279 100644 --- a/config/feature.json +++ b/config/feature.json @@ -129,7 +129,7 @@ "link": "https://winutil.christitus.com/dev/features/features/sandbox" }, "WPFFeatureInstall": { - "Content": "Run Features", + "Content": "Install Features", "category": "Features", "panel": "1", "Type": "Button", diff --git a/functions/private/Invoke-WinUtilFeatureInstall.ps1 b/functions/private/Invoke-WinUtilFeatureInstall.ps1 index 3f63b0f8..1017223f 100644 --- a/functions/private/Invoke-WinUtilFeatureInstall.ps1 +++ b/functions/private/Invoke-WinUtilFeatureInstall.ps1 @@ -1,49 +1,16 @@ -function Invoke-WinUtilFeatureInstall { - <# +function Invoke-WinUtilFeatureInstall ($CheckBox) { - .SYNOPSIS - Converts all the values from the tweaks.json and routes them to the appropriate function - - #> - - param( - $CheckBox - ) - - if($sync.configs.feature.$CheckBox.feature) { - Foreach( $feature in $sync.configs.feature.$CheckBox.feature ) { - try { - Write-Host "Installing $feature" - Enable-WindowsOptionalFeature -Online -FeatureName $feature -All -NoRestart - } catch { - if ($CheckBox.Exception.Message -like "*requires elevation*") { - Write-Warning "Unable to Install $feature due to permissions. Are you running as admin?" - Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Error" } - } else { - - Write-Warning "Unable to Install $feature due to unhandled exception." - Write-Warning $CheckBox.Exception.StackTrace - } - } + if ($sync.configs.feature.$CheckBox.feature) { + foreach ($feature in $sync.configs.feature.$CheckBox.feature) { + Write-Host "Installing $feature" + Enable-WindowsOptionalFeature -Online -FeatureName $feature -All -NoRestart -ErrorAction Stop } } - if($sync.configs.feature.$CheckBox.InvokeScript) { - Foreach( $script in $sync.configs.feature.$CheckBox.InvokeScript ) { - try { - $Scriptblock = [scriptblock]::Create($script) - Write-Host "Running Script for $CheckBox" - Invoke-Command $scriptblock -ErrorAction stop - } catch { - if ($CheckBox.Exception.Message -like "*requires elevation*") { - Write-Warning "Unable to Install $feature due to permissions. Are you running as admin?" - Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Error" } - } else { - Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Error" } - Write-Warning "Unable to Install $feature due to unhandled exception." - Write-Warning $CheckBox.Exception.StackTrace - } - } + if ($sync.configs.feature.$CheckBox.InvokeScript) { + foreach ($script in $sync.configs.feature.$CheckBox.InvokeScript) { + Write-Host "Running Script for $CheckBox" + Invoke-Command -ScriptBlock ([scriptblock]::Create($script)) -ErrorAction Stop } } }