mirror of
https://github.com/ChrisTitusTech/winutil
synced 2026-04-05 22:28:31 +00:00
Cleaned up typos, fixes grammatical errors and other related fixes (#4215)
* cleaned up typo, fixes, grammatical and other related fixes (#2) * typo in Lightshot app name * remove trailing comma in applications.json * consistent capitalization of Windows, WinGet - only user-facing text - includes update to devdocs-generator.ps1, so docs for tweaks modifying registry will have `Windows settings` rather than `windows settings` * various fixes for typos, style, punctuation and capitalization * capitalize 'AM' * Update README.md change formatting for GitHub UI interaction form code format (` `) to bold md Co-authored-by: Jay <65828559+Jay-o-Way@users.noreply.github.com> * typos and wording in docs --------- Co-authored-by: Jay <65828559+Jay-o-Way@users.noreply.github.com>
This commit is contained in:
@@ -34,21 +34,21 @@ function Get-WinUtilSelectedPackages
|
||||
if ($package.choco -eq "na") {
|
||||
Write-Debug "$($package.content) has no Choco value."
|
||||
$null = $packagesWinget.add($($package.winget))
|
||||
Write-Host "Queueing $($package.winget) for Winget"
|
||||
Write-Host "Queueing $($package.winget) for WinGet..."
|
||||
} else {
|
||||
$null = $packagesChoco.add($package.choco)
|
||||
Write-Host "Queueing $($package.choco) for Chocolatey"
|
||||
Write-Host "Queueing $($package.choco) for Chocolatey..."
|
||||
}
|
||||
break
|
||||
}
|
||||
"Winget" {
|
||||
if ($package.winget -eq "na") {
|
||||
Write-Debug "$($package.content) has no Winget value."
|
||||
Write-Debug "$($package.content) has no WinGet value."
|
||||
$null = $packagesChoco.add($package.choco)
|
||||
Write-Host "Queueing $($package.choco) for Chocolatey"
|
||||
Write-Host "Queueing $($package.choco) for Chocolatey..."
|
||||
} else {
|
||||
$null = $packagesWinget.add($($package.winget))
|
||||
Write-Host "Queueing $($package.winget) for Winget"
|
||||
Write-Host "Queueing $($package.winget) for WinGet..."
|
||||
}
|
||||
break
|
||||
}
|
||||
|
||||
@@ -20,9 +20,9 @@ Function Get-WinUtilToggleStatus {
|
||||
if (($ToggleSwitchReg.path -imatch "hku") -and !(Get-PSDrive -Name HKU -ErrorAction SilentlyContinue)) {
|
||||
$null = (New-PSDrive -PSProvider Registry -Name HKU -Root HKEY_USERS)
|
||||
if (Get-PSDrive -Name HKU -ErrorAction SilentlyContinue) {
|
||||
Write-Debug "HKU drive created successfully"
|
||||
Write-Debug "HKU drive created successfully."
|
||||
} else {
|
||||
Write-Debug "Failed to create HKU drive"
|
||||
Write-Debug "Failed to create HKU drive."
|
||||
}
|
||||
}
|
||||
} catch {
|
||||
|
||||
@@ -10,6 +10,6 @@ function Install-WinUtilChoco {
|
||||
return
|
||||
}
|
||||
|
||||
Write-Host "Chocolatey is not installed, installing now."
|
||||
Write-Host "Chocolatey is not installed. Installing now..."
|
||||
Invoke-WebRequest -Uri https://community.chocolatey.org/install.ps1 -UseBasicParsing | Invoke-Expression
|
||||
}
|
||||
|
||||
@@ -205,7 +205,7 @@ function Install-WinUtilProgramChoco {
|
||||
Write-Host "Searching for metapackages of $Program (.install or .portable)"
|
||||
$chocoPackages = ((choco list | Select-String -Pattern "$Program(\.install|\.portable)?").Matches.Value) -join " "
|
||||
if ($chocoPackages) {
|
||||
Write-Host "Starting uninstallation of $chocoPackages with Chocolatey."
|
||||
Write-Host "Starting uninstallation of $chocoPackages with Chocolatey..."
|
||||
try {
|
||||
$uninstallStatusCode = Invoke-ChocoCommand "uninstall $chocoPackages -y"
|
||||
Write-Host "$Program" $(if ($uninstallStatusCode -eq 0) { "uninstalled successfully." } else { "failed to uninstall." })
|
||||
|
||||
@@ -28,10 +28,10 @@ Function Install-WinUtilProgramWinget {
|
||||
Invokes the winget.exe with the provided arguments and return the exit code
|
||||
|
||||
.PARAMETER wingetId
|
||||
The Id of the Program that Winget should Install/Uninstall
|
||||
The Id of the Program that WinGet should Install/Uninstall
|
||||
|
||||
.NOTES
|
||||
Invoke Winget uses the public variable $Action defined outside the function to determine if a Program should be installed or removed
|
||||
Invoke WinGet uses the public variable $Action defined outside the function to determine if a Program should be installed or removed
|
||||
#>
|
||||
param (
|
||||
[string]$wingetId
|
||||
@@ -61,7 +61,7 @@ Function Install-WinUtilProgramWinget {
|
||||
Contains the Install Logic and return code handling from winget
|
||||
|
||||
.PARAMETER Program
|
||||
The Winget ID of the Program that should be installed
|
||||
The WinGet ID of the Program that should be installed
|
||||
#>
|
||||
param (
|
||||
[string]$Program
|
||||
@@ -71,7 +71,7 @@ Function Install-WinUtilProgramWinget {
|
||||
Write-Host "$($Program) installed successfully."
|
||||
return $true
|
||||
} elseif ($status -eq -1978335189) {
|
||||
Write-Host "$($Program) No applicable update found"
|
||||
Write-Host "No applicable update found for $($Program)."
|
||||
return $true
|
||||
}
|
||||
|
||||
@@ -82,10 +82,10 @@ Function Install-WinUtilProgramWinget {
|
||||
Function Invoke-Uninstall {
|
||||
<#
|
||||
.SYNOPSIS
|
||||
Contains the Uninstall Logic and return code handling from winget
|
||||
Contains the Uninstall Logic and return code handling from WinGet
|
||||
|
||||
.PARAMETER Program
|
||||
The Winget ID of the Program that should be uninstalled
|
||||
The WinGet ID of the Program that should be uninstalled
|
||||
#>
|
||||
param (
|
||||
[string]$Program
|
||||
@@ -110,7 +110,7 @@ Function Install-WinUtilProgramWinget {
|
||||
$failedPackages = @()
|
||||
|
||||
Write-Host "==========================================="
|
||||
Write-Host "-- Configuring winget packages ---"
|
||||
Write-Host "-- Configuring WinGet packages ---"
|
||||
Write-Host "==========================================="
|
||||
|
||||
for ($i = 0; $i -lt $count; $i++) {
|
||||
@@ -130,6 +130,6 @@ Function Install-WinUtilProgramWinget {
|
||||
}
|
||||
}
|
||||
|
||||
Set-WinUtilProgressBar -label "$($Action)ation done" -percent 100
|
||||
Set-WinUtilProgressBar -label "$($Action) action done." -percent 100
|
||||
return $failedPackages
|
||||
}
|
||||
|
||||
@@ -2,16 +2,16 @@ function Install-WinUtilWinget {
|
||||
<#
|
||||
|
||||
.SYNOPSIS
|
||||
Installs Winget if not already installed.
|
||||
Installs WinGet if not already installed.
|
||||
|
||||
.DESCRIPTION
|
||||
installs winget if needed
|
||||
installs winGet if needed
|
||||
#>
|
||||
if ((Test-WinUtilPackageManager -winget) -eq "installed") {
|
||||
return
|
||||
}
|
||||
|
||||
Write-Host "Winget is not Installed. Installing." -ForegroundColor Red
|
||||
Write-Host "WinGet is not installed. Installing now..." -ForegroundColor Red
|
||||
Set-PSRepository -Name PSGallery -InstallationPolicy Trusted
|
||||
|
||||
Install-PackageProvider -Name NuGet -Force
|
||||
|
||||
@@ -21,7 +21,7 @@ function Invoke-WinUtilFeatureInstall {
|
||||
Invoke-WPFUIThread -ScriptBlock { Set-WinUtilTaskbaritem -state "Error" }
|
||||
} else {
|
||||
|
||||
Write-Warning "Unable to Install $feature due to unhandled exception"
|
||||
Write-Warning "Unable to Install $feature due to unhandled exception."
|
||||
Write-Warning $CheckBox.Exception.StackTrace
|
||||
}
|
||||
}
|
||||
@@ -40,7 +40,7 @@ function Invoke-WinUtilFeatureInstall {
|
||||
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 "Unable to Install $feature due to unhandled exception."
|
||||
Write-Warning $CheckBox.Exception.StackTrace
|
||||
}
|
||||
}
|
||||
|
||||
@@ -133,7 +133,7 @@ function Invoke-WinUtilISOModify {
|
||||
|
||||
if (-not $isoPath) {
|
||||
[System.Windows.MessageBox]::Show(
|
||||
"No verified ISO found. Please complete Steps 1 and 2 first.",
|
||||
"No verified ISO found. Please complete Steps 1 and 2 first.",
|
||||
"Not Ready", "OK", "Warning")
|
||||
return
|
||||
}
|
||||
@@ -416,12 +416,12 @@ function Invoke-WinUtilISOCleanAndReset {
|
||||
Log "WIM dismounted successfully."
|
||||
}
|
||||
} elseif (Test-Path $mountDir) {
|
||||
Log "No mounted WIM reported by Get-WindowsImage, running DISM /Cleanup-Wim as a precaution..."
|
||||
Log "No mounted WIM reported by Get-WindowsImage. Running DISM /Cleanup-Wim as a precaution..."
|
||||
SetProgress "Running DISM cleanup..." 3
|
||||
& dism /English /Cleanup-Wim 2>&1 | ForEach-Object { Log $_ }
|
||||
}
|
||||
} catch {
|
||||
Log "Warning: could not dismount WIM cleanly, attempting DISM /Cleanup-Wim fallback: $_"
|
||||
Log "Warning: could not dismount WIM cleanly. Attempting DISM /Cleanup-Wim fallback: $_"
|
||||
try { & dism /English /Cleanup-Wim 2>&1 | ForEach-Object { Log $_ } }
|
||||
catch { Log "Warning: DISM /Cleanup-Wim also failed: $_" }
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@ function Invoke-WinUtilISORefreshUSBDrives {
|
||||
$combo.Items.Clear()
|
||||
|
||||
if ($removable.Count -eq 0) {
|
||||
$combo.Items.Add("No USB drives detected")
|
||||
$combo.Items.Add("No USB drives detected.")
|
||||
$combo.SelectedIndex = 0
|
||||
$sync["Win11ISOUSBDisks"] = @()
|
||||
Write-Win11ISOLog "No USB drives detected."
|
||||
@@ -26,7 +26,7 @@ function Invoke-WinUtilISOWriteUSB {
|
||||
$usbDisks = $sync["Win11ISOUSBDisks"]
|
||||
|
||||
if (-not $contentsDir -or -not (Test-Path $contentsDir)) {
|
||||
[System.Windows.MessageBox]::Show("No modified ISO content found. Please complete Steps 1-3 first.", "Not Ready", "OK", "Warning")
|
||||
[System.Windows.MessageBox]::Show("No modified ISO content found. Please complete Steps 1-3 first.", "Not Ready", "OK", "Warning")
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
@@ -9,12 +9,12 @@ function Invoke-WinUtilSSHServer {
|
||||
|
||||
# Install the OpenSSH Server feature if not already installed
|
||||
if ($FeatureName.State -ne "Installed") {
|
||||
Write-Host "Enabling OpenSSH Server"
|
||||
Write-Host "Enabling OpenSSH Server..."
|
||||
Add-WindowsCapability -Online -Name $FeatureName.Name
|
||||
}
|
||||
|
||||
# Sets up the OpenSSH Server service
|
||||
Write-Host "Starting the services"
|
||||
Write-Host "Starting the services..."
|
||||
Start-Service -Name sshd
|
||||
Set-Service -Name sshd -StartupType Automatic
|
||||
|
||||
@@ -50,7 +50,7 @@ function Invoke-WinUtilSSHServer {
|
||||
}
|
||||
|
||||
#Adding Firewall rule for port 22
|
||||
Write-Host "Setting up firewall rules"
|
||||
Write-Host "Setting up firewall rules..."
|
||||
$firewallRule = (Get-NetFirewallRule -Name 'sshd').Enabled
|
||||
if ($firewallRule) {
|
||||
Write-Host "Firewall rule for OpenSSH Server (sshd) already exists."
|
||||
|
||||
@@ -21,7 +21,7 @@ function Invoke-WinUtilScript {
|
||||
)
|
||||
|
||||
try {
|
||||
Write-Host "Running Script for $name"
|
||||
Write-Host "Running Script for $Name"
|
||||
Invoke-Command $scriptblock -ErrorAction Stop
|
||||
} catch [System.Management.Automation.CommandNotFoundException] {
|
||||
Write-Warning "The specified command was not found."
|
||||
@@ -37,7 +37,7 @@ function Invoke-WinUtilScript {
|
||||
Write-Warning $PSItem.Exception.message
|
||||
} catch {
|
||||
# Generic catch block to handle any other type of exception
|
||||
Write-Warning "Unable to run script for $name due to unhandled exception"
|
||||
Write-Warning "Unable to run script for $Name due to unhandled exception."
|
||||
Write-Warning $psitem.Exception.StackTrace
|
||||
}
|
||||
|
||||
|
||||
@@ -60,7 +60,7 @@ function Invoke-WinUtilTweaks {
|
||||
$changeservice = $false
|
||||
}
|
||||
} catch [System.ServiceProcess.ServiceNotFoundException] {
|
||||
Write-Warning "Service $($psitem.Name) was not found"
|
||||
Write-Warning "Service $($psitem.Name) was not found."
|
||||
}
|
||||
}
|
||||
|
||||
@@ -76,9 +76,9 @@ function Invoke-WinUtilTweaks {
|
||||
if (($psitem.Path -imatch "hku") -and !(Get-PSDrive -Name HKU -ErrorAction SilentlyContinue)) {
|
||||
$null = (New-PSDrive -PSProvider Registry -Name HKU -Root HKEY_USERS)
|
||||
if (Get-PSDrive -Name HKU -ErrorAction SilentlyContinue) {
|
||||
Write-Debug "HKU drive created successfully"
|
||||
Write-Debug "HKU drive created successfully."
|
||||
} else {
|
||||
Write-Debug "Failed to create HKU drive"
|
||||
Write-Debug "Failed to create HKU drive."
|
||||
}
|
||||
}
|
||||
Set-WinUtilRegistry -Name $psitem.Name -Path $psitem.Path -Type $psitem.Type -Value $psitem.$($values.registry)
|
||||
|
||||
@@ -7,5 +7,5 @@ function Invoke-WinUtilUninstallPSProfile {
|
||||
Remove-Item $Profile
|
||||
}
|
||||
|
||||
Write-Host "Successfully uninstalled CTT Powershell Profile" -ForegroundColor Green
|
||||
Write-Host "Successfully uninstalled CTT PowerShell Profile." -ForegroundColor Green
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@ function Set-WinUtilDNS {
|
||||
if($DNSProvider -eq "Default") {return}
|
||||
try {
|
||||
$Adapters = Get-NetAdapter | Where-Object {$_.Status -eq "Up"}
|
||||
Write-Host "Ensuring DNS is set to $DNSProvider on the following interfaces"
|
||||
Write-Host "Ensuring DNS is set to $DNSProvider on the following interfaces:"
|
||||
Write-Host $($Adapters | Out-String)
|
||||
|
||||
Foreach ($Adapter in $Adapters) {
|
||||
@@ -27,7 +27,7 @@ function Set-WinUtilDNS {
|
||||
}
|
||||
}
|
||||
} catch {
|
||||
Write-Warning "Unable to set DNS Provider due to an unhandled exception"
|
||||
Write-Warning "Unable to set DNS Provider due to an unhandled exception."
|
||||
Write-Warning $psitem.Exception.StackTrace
|
||||
}
|
||||
}
|
||||
|
||||
@@ -31,7 +31,7 @@ function Set-WinUtilRegistry {
|
||||
if(!(Test-Path 'HKU:\')) {New-PSDrive -PSProvider Registry -Name HKU -Root HKEY_USERS}
|
||||
|
||||
If (!(Test-Path $Path)) {
|
||||
Write-Host "$Path was not found, Creating..."
|
||||
Write-Host "$Path was not found. Creating..."
|
||||
New-Item -Path $Path -Force -ErrorAction Stop | Out-Null
|
||||
}
|
||||
|
||||
@@ -44,13 +44,13 @@ function Set-WinUtilRegistry {
|
||||
Remove-ItemProperty -Path $Path -Name $Name -Force -ErrorAction Stop | Out-Null
|
||||
}
|
||||
} catch [System.Security.SecurityException] {
|
||||
Write-Warning "Unable to set $Path\$Name to $Value due to a Security Exception"
|
||||
Write-Warning "Unable to set $Path\$Name to $Value due to a Security Exception."
|
||||
} catch [System.Management.Automation.ItemNotFoundException] {
|
||||
Write-Warning $psitem.Exception.ErrorRecord
|
||||
} catch [System.UnauthorizedAccessException] {
|
||||
Write-Warning $psitem.Exception.Message
|
||||
} catch {
|
||||
Write-Warning "Unable to set $Name due to unhandled exception"
|
||||
Write-Warning "Unable to set $Name due to unhandled exception."
|
||||
Write-Warning $psitem.Exception.StackTrace
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,13 +30,13 @@ function Set-WinUtilScheduledTask {
|
||||
}
|
||||
} catch [System.Exception] {
|
||||
if($psitem.Exception.Message -like "*The system cannot find the file specified*") {
|
||||
Write-Warning "Scheduled Task $name was not Found"
|
||||
Write-Warning "Scheduled Task $Name was not found."
|
||||
} else {
|
||||
Write-Warning "Unable to set $Name due to unhandled exception"
|
||||
Write-Warning "Unable to set $Name due to unhandled exception."
|
||||
Write-Warning $psitem.Exception.Message
|
||||
}
|
||||
} catch {
|
||||
Write-Warning "Unable to run script for $name due to unhandled exception"
|
||||
Write-Warning "Unable to run script for $name due to unhandled exception."
|
||||
Write-Warning $psitem.Exception.StackTrace
|
||||
}
|
||||
}
|
||||
|
||||
@@ -31,9 +31,9 @@ Function Set-WinUtilService {
|
||||
$service | Set-Service -StartupType $StartupType -ErrorAction Stop
|
||||
}
|
||||
} catch [System.ServiceProcess.ServiceNotFoundException] {
|
||||
Write-Warning "Service $Name was not found"
|
||||
Write-Warning "Service $Name was not found."
|
||||
} catch {
|
||||
Write-Warning "Unable to set $Name due to unhandled exception"
|
||||
Write-Warning "Unable to set $Name due to unhandled exception."
|
||||
Write-Warning $_.Exception.Message
|
||||
}
|
||||
|
||||
|
||||
@@ -2,10 +2,10 @@ function Test-WinUtilPackageManager {
|
||||
<#
|
||||
|
||||
.SYNOPSIS
|
||||
Checks if Winget and/or Choco are installed
|
||||
Checks if WinGet and/or Choco are installed
|
||||
|
||||
.PARAMETER winget
|
||||
Check if Winget is installed
|
||||
Check if WinGet is installed
|
||||
|
||||
.PARAMETER choco
|
||||
Check if Chocolatey is installed
|
||||
@@ -20,12 +20,12 @@ function Test-WinUtilPackageManager {
|
||||
if ($winget) {
|
||||
if (Get-Command winget -ErrorAction SilentlyContinue) {
|
||||
Write-Host "===========================================" -ForegroundColor Green
|
||||
Write-Host "--- Winget is installed ---" -ForegroundColor Green
|
||||
Write-Host "--- WinGet is installed ---" -ForegroundColor Green
|
||||
Write-Host "===========================================" -ForegroundColor Green
|
||||
$status = "installed"
|
||||
} else {
|
||||
Write-Host "===========================================" -ForegroundColor Red
|
||||
Write-Host "--- Winget is not installed ---" -ForegroundColor Red
|
||||
Write-Host "--- WinGet is not installed ---" -ForegroundColor Red
|
||||
Write-Host "===========================================" -ForegroundColor Red
|
||||
$status = "not-installed"
|
||||
}
|
||||
|
||||
@@ -3,13 +3,13 @@ Function Update-WinUtilProgramWinget {
|
||||
<#
|
||||
|
||||
.SYNOPSIS
|
||||
This will update all programs using Winget
|
||||
This will update all programs using WinGet
|
||||
|
||||
#>
|
||||
|
||||
[ScriptBlock]$wingetinstall = {
|
||||
|
||||
$host.ui.RawUI.WindowTitle = """Winget Install"""
|
||||
$host.ui.RawUI.WindowTitle = """WinGet Install"""
|
||||
|
||||
Start-Transcript "$logdir\winget-update_$dateTime.log" -Append
|
||||
winget upgrade --all --accept-source-agreements --accept-package-agreements --scope=machine --silent
|
||||
|
||||
@@ -3,20 +3,20 @@ function Invoke-WPFFixesWinget {
|
||||
<#
|
||||
|
||||
.SYNOPSIS
|
||||
Fixes Winget by running choco install winget
|
||||
Fixes WinGet by running `choco install winget`
|
||||
.DESCRIPTION
|
||||
BravoNorris for the fantastic idea of a button to reinstall winget
|
||||
BravoNorris for the fantastic idea of a button to reinstall WinGet
|
||||
#>
|
||||
# Install Choco if not already present
|
||||
try {
|
||||
Set-WinUtilTaskbaritem -state "Indeterminate" -overlay "logo"
|
||||
Write-Host "==> Starting Winget Repair"
|
||||
Write-Host "==> Starting WinGet Repair"
|
||||
Install-WinUtilWinget
|
||||
} catch {
|
||||
Write-Error "Failed to install winget: $_"
|
||||
Write-Error "Failed to install WinGet: $_"
|
||||
Set-WinUtilTaskbaritem -state "Error" -overlay "warning"
|
||||
} finally {
|
||||
Write-Host "==> Finished Winget Repair"
|
||||
Write-Host "==> Finished WinGet Repair"
|
||||
Set-WinUtilTaskbaritem -state "None" -overlay "checkmark"
|
||||
}
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ function Invoke-WPFInstall {
|
||||
}
|
||||
|
||||
if ($PackagesToInstall.Count -eq 0) {
|
||||
$WarningMsg = "Please select the program(s) to install or upgrade"
|
||||
$WarningMsg = "Please select the program(s) to install or upgrade."
|
||||
[System.Windows.MessageBox]::Show($WarningMsg, $AppTitle, [System.Windows.MessageBoxButton]::OK, [System.Windows.MessageBoxImage]::Warning)
|
||||
return
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user