mirror of
https://github.com/ChrisTitusTech/winutil.git
synced 2024-11-14 14:45:52 -06:00
Change Verbs to be in the list of Approved Verbs (#2912)
Check-UpgradeNeeded -> Test-UpgradeNeeded Run-ChocoCommand -> Invoke-ChocoCommand
This commit is contained in:
parent
def47fe018
commit
66e6aa7e96
@ -44,7 +44,7 @@ function Install-WinUtilProgramChoco {
|
|||||||
New-Item -ItemType File -Path $filePath | Out-Null
|
New-Item -ItemType File -Path $filePath | Out-Null
|
||||||
}
|
}
|
||||||
|
|
||||||
function Run-ChocoCommand {
|
function Invoke-ChocoCommand {
|
||||||
<#
|
<#
|
||||||
.SYNOPSIS
|
.SYNOPSIS
|
||||||
Executes a Chocolatey command with the specified arguments and returns the exit code.
|
Executes a Chocolatey command with the specified arguments and returns the exit code.
|
||||||
@ -60,14 +60,14 @@ function Install-WinUtilProgramChoco {
|
|||||||
The exit code of the Chocolatey command.
|
The exit code of the Chocolatey command.
|
||||||
|
|
||||||
.EXAMPLE
|
.EXAMPLE
|
||||||
$exitCode = Run-ChocoCommand -arguments "install 7zip -y"
|
$exitCode = Invoke-ChocoCommand -arguments "install 7zip -y"
|
||||||
#>
|
#>
|
||||||
|
|
||||||
param ($arguments)
|
param ($arguments)
|
||||||
return (Start-Process -FilePath "choco" -ArgumentList $arguments -Wait -PassThru).ExitCode
|
return (Start-Process -FilePath "choco" -ArgumentList $arguments -Wait -PassThru).ExitCode
|
||||||
}
|
}
|
||||||
|
|
||||||
function Check-UpgradeNeeded {
|
function Test-UpgradeNeeded {
|
||||||
<#
|
<#
|
||||||
.SYNOPSIS
|
.SYNOPSIS
|
||||||
Checks if an upgrade is needed for a Chocolatey package based on the content of a log file.
|
Checks if an upgrade is needed for a Chocolatey package based on the content of a log file.
|
||||||
@ -83,7 +83,7 @@ function Install-WinUtilProgramChoco {
|
|||||||
True if the log file indicates that an upgrade is needed; otherwise, false.
|
True if the log file indicates that an upgrade is needed; otherwise, false.
|
||||||
|
|
||||||
.EXAMPLE
|
.EXAMPLE
|
||||||
$isUpgradeNeeded = Check-UpgradeNeeded -filePath "C:\temp\install-output.txt"
|
$isUpgradeNeeded = Test-UpgradeNeeded -filePath "C:\temp\install-output.txt"
|
||||||
#>
|
#>
|
||||||
|
|
||||||
param ($filePath)
|
param ($filePath)
|
||||||
@ -149,11 +149,11 @@ function Install-WinUtilProgramChoco {
|
|||||||
Write-Host "Starting installation of $Program with Chocolatey."
|
Write-Host "Starting installation of $Program with Chocolatey."
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$installStatusCode = Run-ChocoCommand "install $Program -y --log-file $installOutputFile"
|
$installStatusCode = Invoke-ChocoCommand "install $Program -y --log-file $installOutputFile"
|
||||||
if ($installStatusCode -eq 0) {
|
if ($installStatusCode -eq 0) {
|
||||||
|
|
||||||
if (Check-UpgradeNeeded $installOutputFile) {
|
if (Test-UpgradeNeeded $installOutputFile) {
|
||||||
$upgradeStatusCode = Run-ChocoCommand "upgrade $Program -y"
|
$upgradeStatusCode = Invoke-ChocoCommand "upgrade $Program -y"
|
||||||
Write-Host "$Program was" $(if ($upgradeStatusCode -eq 0) { "upgraded successfully." } else { "not upgraded." })
|
Write-Host "$Program was" $(if ($upgradeStatusCode -eq 0) { "upgraded successfully." } else { "not upgraded." })
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@ -207,7 +207,7 @@ function Install-WinUtilProgramChoco {
|
|||||||
if ($chocoPackages) {
|
if ($chocoPackages) {
|
||||||
Write-Host "Starting uninstallation of $chocoPackages with Chocolatey."
|
Write-Host "Starting uninstallation of $chocoPackages with Chocolatey."
|
||||||
try {
|
try {
|
||||||
$uninstallStatusCode = Run-ChocoCommand "uninstall $chocoPackages -y"
|
$uninstallStatusCode = Invoke-ChocoCommand "uninstall $chocoPackages -y"
|
||||||
Write-Host "$Program" $(if ($uninstallStatusCode -eq 0) { "uninstalled successfully." } else { "failed to uninstall." })
|
Write-Host "$Program" $(if ($uninstallStatusCode -eq 0) { "uninstalled successfully." } else { "failed to uninstall." })
|
||||||
}
|
}
|
||||||
catch {
|
catch {
|
||||||
|
Loading…
Reference in New Issue
Block a user