Added check for execution context

Added checks for execution context. Fix notification display if 'winget-upgrade.ps1' run without privilege.
pull/2/head v1.2.4
Romanitho 2022-01-24 19:39:54 +01:00 committed by GitHub
parent ebe48a8eec
commit 4c3107dafa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 10 deletions

View File

@ -66,14 +66,20 @@ function Start-NotifTask ($Title,$Message,$MessageType,$Balise) {
} }
$ToastTemplate.Save("$ToastTemplateLocation\notif.xml") $ToastTemplate.Save("$ToastTemplateLocation\notif.xml")
#Send Notification to user. First, check if script it is run as admin (or system)
#Send Notification to user $currentPrincipal = New-Object Security.Principal.WindowsPrincipal([Security.Principal.WindowsIdentity]::GetCurrent())
if ($currentPrincipal.IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)){
Get-ScheduledTask -TaskName "Winget Update Notify" -ErrorAction SilentlyContinue | Start-ScheduledTask -ErrorAction SilentlyContinue Get-ScheduledTask -TaskName "Winget Update Notify" -ErrorAction SilentlyContinue | Start-ScheduledTask -ErrorAction SilentlyContinue
#Wait for notification to display #Wait for notification to display
while ((Get-ScheduledTask -TaskName "Winget Update Notify").State -ne 'Ready') { while ((Get-ScheduledTask -TaskName "Winget Update Notify").State -ne 'Ready') {
Write-Output "Waiting for scheduled task..." Write-Output "Waiting for scheduled task..."
Start-Sleep 3 Start-Sleep 3
} }
}
#else, run as user
else{
& wscript.exe "$WorkingDir\Invisible.vbs" "powershell.exe -ExecutionPolicy Bypass -File """$WorkingDir\winget-notify.ps1""
}
} }
function Test-Network { function Test-Network {
@ -174,8 +180,9 @@ function Get-WingetOutdated {
$software.Id = $line.Substring($idStart, $versionStart - $idStart).TrimEnd() $software.Id = $line.Substring($idStart, $versionStart - $idStart).TrimEnd()
$software.Version = $line.Substring($versionStart, $availableStart - $versionStart).TrimEnd() $software.Version = $line.Substring($versionStart, $availableStart - $versionStart).TrimEnd()
$software.AvailableVersion = $line.Substring($availableStart, $sourceStart - $availableStart).TrimEnd() $software.AvailableVersion = $line.Substring($availableStart, $sourceStart - $availableStart).TrimEnd()
#check if Avalaible Version is > than Current Version #check if Avalaible Version is > than Current Version (block "unknow" versions loop)
if ([version]$software.AvailableVersion -gt [version]$software.Version){ $IsNewVersion = [version]$software.AvailableVersion -gt [version]$software.Version
if ($IsNewVersion){
$upgradeList += $software $upgradeList += $software
} }
} }
@ -301,3 +308,4 @@ else{
Start-NotifTask $Title $Message $MessageType $Balise Start-NotifTask $Title $Message $MessageType $Balise
} }
Write-Log "End of process!" "Cyan" Write-Log "End of process!" "Cyan"
Sleep 3