fix syntax

This commit is contained in:
Chris Titus
2024-05-09 17:20:27 -07:00
parent ea60dac8dd
commit db0024b7c5
2 changed files with 29 additions and 20 deletions

1
.gitignore vendored
View File

@ -44,3 +44,4 @@ Microsoft.PowerShell.ConsoleHost.dll
microwin.log
True
test.ps1
winutil.ps1

View File

@ -26,7 +26,7 @@ Function Install-WinUtilProgramWinget {
Foreach ($Program in $($ProgramsToInstall -split ",")){
Write-Progres -Activity "$manage Applications" -Status "$manage $Program $($x + 1) of $count" -PercentComplete $($x/$count*100)
Write-Progress -Activity "$manage Applications" -Status "$manage $Program $($x + 1) of $count" -PercentComplete $($x/$count*100)
if($manage -eq "Installing"){
# Install package via ID, if it fails try again with different scope and then with an unelevated prompt.
# Since Install-WinGetPackage might not be directly available, we use winget install command as a workaround.
@ -34,22 +34,30 @@ Function Install-WinUtilProgramWinget {
# This is up to the individual package maintainers to enable these options. Aka. not as clean as Linux Package Managers.
try {
$status = $(Start-Process -FilePath "winget" -ArgumentList "install --id $Program --silent --accept-source-agreements --accept-package-agreements" -Wait -PassThru).ExitCode
if(status -eq 0){
write-host "$program installed successfully."
if($status -eq 0){
Write-Host "$Program installed successfully."
continue
}
Write-Host "Attempt with User scope"
$status = $(Start-Process -FilePath "winget" -ArgumentList "install --id $Program --scope user --silent --accept-source-agreements --accept-package-agreements" -Wait -PassThru).ExitCode
if(status -eq 0){
if($status -eq 0){
Write-Host "$Program installed successfully with User scope."
continue
}
Write-Host "Attempt with Unelevated prompt"
$status = $(Start-Process -FilePath "powershell" -ArgumentList "-Command Start-Process winget -ArgumentList 'install --id $Program --silent --accept-source-agreements --accept-package-agreements' -Verb runAsUser" -Wait -PassThru).ExitCode
if(status -eq 0){
$process = Start-Process -FilePath "powershell" -ArgumentList "-Command Start-Process winget -ArgumentList 'install --id $Program --silent --accept-source-agreements --accept-package-agreements' -Verb runAsUser" -Wait -PassThru
if($process.ExitCode -eq 0){
Write-Host "$Program installed successfully with Unelevated prompt."
continue
}
Write-Host "Attempting installation with Chocolatey as a fallback method"
$chocoStatus = $(Start-Process -FilePath "choco" -ArgumentList "install $Program -y" -Wait -PassThru).ExitCode
if($chocoStatus -eq 0){
Write-Host "$Program installed successfully using Chocolatey."
continue
} else {
Write-Host "Failed to install $Program using Chocolatey."
}
Write-Host "Failed to install $Program."
} catch {
Write-Host "Failed to install $Program due to an error: $_"