diff --git a/scripts/check-power.ps1 b/scripts/check-power.ps1 index 714e1661..4d386824 100755 --- a/scripts/check-power.ps1 +++ b/scripts/check-power.ps1 @@ -29,7 +29,7 @@ try { } elseif ($percent -ge 95) { $reply = "✅ Battery full ($percent%, power scheme is '$powerScheme')" } else { - $reply = "✅ Battery charging ($percent%, power scheme is '$powerScheme')" + $reply = "✅ Battery $percent% and charging (power scheme is '$powerScheme')" } } else { # must be offline if (($remaining -eq 0) -and ($percent -ge 60)) { diff --git a/scripts/install-updates.ps1 b/scripts/install-updates.ps1 index 4d5b8f61..705ecd9c 100755 --- a/scripts/install-updates.ps1 +++ b/scripts/install-updates.ps1 @@ -55,10 +55,20 @@ try { & "$PSScriptRoot/check-pending-reboot.ps1" Start-Sleep -seconds 3 "" - "⏳ (2/2) Installing updates from winget..." + "⏳ (2/4) Updating Windows Store apps..." + if (Get-Command winget -ErrorAction SilentlyContinue) { + & winget upgrade --all --source=msstore --include-unknown + } "" - & winget upgrade --all --source=winget - # & winget upgrade --all --source=msstore # does not work + "⏳ (3/4) Updating Chocolatey packages..." + if (Get-Command choco -ErrorAction SilentlyContinue) { + & choco upgrade all -y + } + "" + "⏳ (4/4) Updating Winget packages..." + if (Get-Command winget -ErrorAction SilentlyContinue) { + & winget upgrade --all --source=winget --include-unknown + } } [int]$elapsed = $stopWatch.Elapsed.TotalSeconds "✅ Updates installed in $($elapsed)s."