diff --git a/.github/.powershell-psscriptanalyzer.psd1 b/.github/.powershell-psscriptanalyzer.psd1 index 84269ea..a961da3 100644 --- a/.github/.powershell-psscriptanalyzer.psd1 +++ b/.github/.powershell-psscriptanalyzer.psd1 @@ -17,4 +17,4 @@ 'PSUseShouldProcessForStateChangingFunctions', 'PSUseDeclaredVarsMoreThanAssignments' ) -} \ No newline at end of file +} diff --git a/Sources/Winget-AutoUpdate/WAU-Policies.ps1 b/Sources/Winget-AutoUpdate/WAU-Policies.ps1 index da104c9..46c1f61 100644 --- a/Sources/Winget-AutoUpdate/WAU-Policies.ps1 +++ b/Sources/Winget-AutoUpdate/WAU-Policies.ps1 @@ -98,4 +98,4 @@ if ($WAUConfig.WAU_RunGPOManagement -eq 1) { $WAUConfig.PSObject.Properties | Where-Object { $_.Name -like "WAU_*" } | Select-Object Name, Value | Out-File -Encoding default -FilePath $GPOLogFile -Append } -Exit 0 \ No newline at end of file +Exit 0 diff --git a/Sources/Winget-AutoUpdate/functions/Add-ScopeMachine.ps1 b/Sources/Winget-AutoUpdate/functions/Add-ScopeMachine.ps1 index 42f7184..8b2785e 100644 --- a/Sources/Winget-AutoUpdate/functions/Add-ScopeMachine.ps1 +++ b/Sources/Winget-AutoUpdate/functions/Add-ScopeMachine.ps1 @@ -29,4 +29,4 @@ function Add-ScopeMachine { } $ConfigFile | ConvertTo-Json -Depth 100 | Out-File $SettingsPath -Encoding utf8 -Force -} \ No newline at end of file +} diff --git a/Sources/Winget-AutoUpdate/functions/Confirm-Installation.ps1 b/Sources/Winget-AutoUpdate/functions/Confirm-Installation.ps1 index 6d4d750..98ca81b 100644 --- a/Sources/Winget-AutoUpdate/functions/Confirm-Installation.ps1 +++ b/Sources/Winget-AutoUpdate/functions/Confirm-Installation.ps1 @@ -21,4 +21,4 @@ Function Confirm-Installation ($AppName, $AppVer) { else { return $false } -} \ No newline at end of file +} diff --git a/Sources/Winget-AutoUpdate/functions/Get-AZCopy.ps1 b/Sources/Winget-AutoUpdate/functions/Get-AZCopy.ps1 index e6f7d54..c94b175 100644 --- a/Sources/Winget-AutoUpdate/functions/Get-AZCopy.ps1 +++ b/Sources/Winget-AutoUpdate/functions/Get-AZCopy.ps1 @@ -47,4 +47,4 @@ Function Get-AZCopy ($WingetUpdatePath) { $AZCopyCurrentVersion = $AZCopyVersionRegex.Match($AZCopyCurrentVersion).Value Write-ToLog "AZCopy version $AZCopyCurrentVersion installed" } -} \ No newline at end of file +} diff --git a/Sources/Winget-AutoUpdate/functions/Get-WAUAvailableVersion.ps1 b/Sources/Winget-AutoUpdate/functions/Get-WAUAvailableVersion.ps1 index 90c90fb..24b289e 100644 --- a/Sources/Winget-AutoUpdate/functions/Get-WAUAvailableVersion.ps1 +++ b/Sources/Winget-AutoUpdate/functions/Get-WAUAvailableVersion.ps1 @@ -38,4 +38,4 @@ function Get-WAUAvailableVersion { #Return version return $WAUAvailableVersion -} \ No newline at end of file +} diff --git a/Sources/Winget-AutoUpdate/functions/Get-WAUConfig.ps1 b/Sources/Winget-AutoUpdate/functions/Get-WAUConfig.ps1 index 6f9855c..0772a82 100644 --- a/Sources/Winget-AutoUpdate/functions/Get-WAUConfig.ps1 +++ b/Sources/Winget-AutoUpdate/functions/Get-WAUConfig.ps1 @@ -23,4 +23,4 @@ Function Get-WAUConfig { #Return config return $WAUConfig -} \ No newline at end of file +} diff --git a/Sources/Winget-AutoUpdate/functions/Get-WingetCmd.ps1 b/Sources/Winget-AutoUpdate/functions/Get-WingetCmd.ps1 index a4a6781..9aa8600 100644 --- a/Sources/Winget-AutoUpdate/functions/Get-WingetCmd.ps1 +++ b/Sources/Winget-AutoUpdate/functions/Get-WingetCmd.ps1 @@ -20,4 +20,4 @@ Function Get-WingetCmd { return $WingetCmd -} \ No newline at end of file +} diff --git a/Sources/Winget-AutoUpdate/functions/Install-Prerequisites.ps1 b/Sources/Winget-AutoUpdate/functions/Install-Prerequisites.ps1 index e415828..bc37a04 100644 --- a/Sources/Winget-AutoUpdate/functions/Install-Prerequisites.ps1 +++ b/Sources/Winget-AutoUpdate/functions/Install-Prerequisites.ps1 @@ -96,4 +96,4 @@ function Install-Prerequisites { } -} \ No newline at end of file +} diff --git a/Sources/Winget-AutoUpdate/functions/Invoke-DirProtect.ps1 b/Sources/Winget-AutoUpdate/functions/Invoke-DirProtect.ps1 index 4177ab3..169f955 100644 --- a/Sources/Winget-AutoUpdate/functions/Invoke-DirProtect.ps1 +++ b/Sources/Winget-AutoUpdate/functions/Invoke-DirProtect.ps1 @@ -46,4 +46,4 @@ function Invoke-DirProtect ($ModsPath) { catch { return $false } -} \ No newline at end of file +} diff --git a/Sources/Winget-AutoUpdate/functions/Test-ListPath.ps1 b/Sources/Winget-AutoUpdate/functions/Test-ListPath.ps1 index 37de764..1edaa09 100644 --- a/Sources/Winget-AutoUpdate/functions/Test-ListPath.ps1 +++ b/Sources/Winget-AutoUpdate/functions/Test-ListPath.ps1 @@ -32,7 +32,7 @@ function Test-ListPath ($ListPath, $UseWhiteList, $WingetUpdatePath) { # Assign the second string (after "?" to the end) to the variable $sasToken $sasToken = $splitPath[1] - + # Join the parts and add "/$ListType?" in between the parts $ExternalList = -join ($resourceURI, "/$ListType`?", $sasToken) } diff --git a/Sources/Winget-AutoUpdate/functions/Test-Network.ps1 b/Sources/Winget-AutoUpdate/functions/Test-Network.ps1 index cc0e3f6..e6c6536 100644 --- a/Sources/Winget-AutoUpdate/functions/Test-Network.ps1 +++ b/Sources/Winget-AutoUpdate/functions/Test-Network.ps1 @@ -13,16 +13,18 @@ function Test-Network { $ncsiHost = Get-ItemPropertyValue -Path $NlaRegKey -Name ActiveWebProbeHost $ncsiPath = Get-ItemPropertyValue -Path $NlaRegKey -Name ActiveWebProbePath $ncsiContent = Get-ItemPropertyValue -Path $NlaRegKey -Name ActiveWebProbeContent - } catch { + } + catch { $ncsiHost = "www.msftconnecttest.com" $ncsiPath = "connecttest.txt" $ncsiContent = "Microsoft Connect Test" } - + While ($timeout -lt 1800) { try { $ncsiResponse = Invoke-WebRequest -Uri "http://$($ncsiHost)/$($ncsiPath)" -UseBasicParsing -UserAgent ([Microsoft.PowerShell.Commands.PSUserAgent]::Chrome) - } catch { + } + catch { $ncsiResponse = $false } diff --git a/Sources/Winget-AutoUpdate/functions/Update-App.ps1 b/Sources/Winget-AutoUpdate/functions/Update-App.ps1 index 9a9af04..aa72248 100644 --- a/Sources/Winget-AutoUpdate/functions/Update-App.ps1 +++ b/Sources/Winget-AutoUpdate/functions/Update-App.ps1 @@ -130,4 +130,4 @@ Function Update-App ($app) { } -} \ No newline at end of file +} diff --git a/Sources/Winget-AutoUpdate/functions/Write-ToLog.ps1 b/Sources/Winget-AutoUpdate/functions/Write-ToLog.ps1 index 1e0891e..ef495ff 100644 --- a/Sources/Winget-AutoUpdate/functions/Write-ToLog.ps1 +++ b/Sources/Winget-AutoUpdate/functions/Write-ToLog.ps1 @@ -26,7 +26,7 @@ function Write-ToLog { #If header requested if ($IsHeader) { - $Log = "#"*65 + "`n#`t$(Get-Date -Format (Get-culture).DateTimeFormat.ShortDatePattern) - $LogMsg`n" + "#"*65 + $Log = "#" * 65 + "`n#`t$(Get-Date -Format (Get-culture).DateTimeFormat.ShortDatePattern) - $LogMsg`n" + "#" * 65 } else { $Log = "$(Get-Date -UFormat "%T") - $LogMsg" diff --git a/Sources/Winget-AutoUpdate/mods/_AppID-template.ps1 b/Sources/Winget-AutoUpdate/mods/_AppID-template.ps1 index 85b09b7..5880847 100644 --- a/Sources/Winget-AutoUpdate/mods/_AppID-template.ps1 +++ b/Sources/Winget-AutoUpdate/mods/_AppID-template.ps1 @@ -93,7 +93,7 @@ if ($Proc) { Stop-ModsProc $Proc } if ($Svc) { - Stop-ModsSvc $Svc + Stop-ModsSvc $Svc } if ($Wait) { Wait-ModsProc $Wait @@ -135,4 +135,4 @@ if ($RunUser) { Invoke-ModsApp $RunUser "" "" $User } -<# EXTRAS #> \ No newline at end of file +<# EXTRAS #> diff --git a/Sources/Winget-AutoUpdate/mods/_Mods-Functions.ps1 b/Sources/Winget-AutoUpdate/mods/_Mods-Functions.ps1 index 7c098b1..01955c7 100644 --- a/Sources/Winget-AutoUpdate/mods/_Mods-Functions.ps1 +++ b/Sources/Winget-AutoUpdate/mods/_Mods-Functions.ps1 @@ -26,10 +26,10 @@ function Stop-ModsProc ($Proc) { Return } function Stop-ModsSvc ($Svc) { - foreach ($service in $Svc) { - Stop-Service -Name $service -Force -ErrorAction SilentlyContinue | Out-Null - } - Return + foreach ($service in $Svc) { + Stop-Service -Name $service -Force -ErrorAction SilentlyContinue | Out-Null + } + Return } function Wait-ModsProc ($Wait) { @@ -53,93 +53,74 @@ function Uninstall-WingetID ($WingetIDUninst) { Return } -function Uninstall-ModsApp ($AppUninst, $AllVersions) -{ - foreach ($app in $AppUninst) - { +function Uninstall-ModsApp ($AppUninst, $AllVersions) { + foreach ($app in $AppUninst) { # we start from scanning the x64 node in registry, if something was found, then we set x64=TRUE [bool]$app_was_x64 = Process-installedSoftware -app $app -x64 $true; # if nothing was found in x64 node, then we repeat that action in x86 node - if (!$app_was_x64) - { + if (!$app_was_x64) { Process-installedSoftware -app $app | Out-Null; } } Return } -Function Process-installedSoftware() -{ +Function Process-installedSoftware() { [OutputType([Bool])] Param( - [parameter(Mandatory=$true)] [string]$app, - [parameter(Mandatory=$false)][bool] $x64 = $false + [parameter(Mandatory = $true)] [string]$app, + [parameter(Mandatory = $false)][bool] $x64 = $false ) - if($true -eq $x64) - { + if ($true -eq $x64) { [string]$path = "HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall"; } - else - { + else { [string]$path = "HKLM:\Software\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall"; } [bool]$app_was_found = $false; [Microsoft.Win32.RegistryKey[]]$InstalledSoftware = Get-ChildItem $path; - foreach ($obj in $InstalledSoftware) - { - if ($obj.GetValue('DisplayName') -like $App) - { + foreach ($obj in $InstalledSoftware) { + if ($obj.GetValue('DisplayName') -like $App) { $UninstallString = $obj.GetValue('UninstallString') $CleanedUninstallString = $UninstallString.Trim([char]0x0022) - if ($UninstallString -like "MsiExec.exe*") - { + if ($UninstallString -like "MsiExec.exe*") { $ProductCode = Select-String "{.*}" -inputobject $UninstallString $ProductCode = $ProductCode.matches.groups[0].value #MSI x64 Installer $Exec = Start-Process "C:\Windows\System32\msiexec.exe" -ArgumentList "/x$ProductCode REBOOT=R /qn" -PassThru -Wait #Stop Hard Reboot (if bad MSI!) - if ($Exec.ExitCode -eq 1641) - { + if ($Exec.ExitCode -eq 1641) { Start-Process "C:\Windows\System32\shutdown.exe" -ArgumentList "/a" } } - else - { + else { $QuietUninstallString = $obj.GetValue('QuietUninstallString') - if ($QuietUninstallString) - { + if ($QuietUninstallString) { $QuietUninstallString = Select-String "(\x22.*\x22) +(.*)" -inputobject $QuietUninstallString $Command = $QuietUninstallString.matches.groups[1].value $Parameter = $QuietUninstallString.matches.groups[2].value #All EXE x64 Installers (already defined silent uninstall) Start-Process $Command -ArgumentList $Parameter -Wait } - else - { - if ((Test-Path $CleanedUninstallString)) - { + else { + if ((Test-Path $CleanedUninstallString)) { $NullSoft = Select-String -Path $CleanedUninstallString -Pattern "Nullsoft" } - if ($NullSoft) - { + if ($NullSoft) { #NSIS x64 Installer Start-Process $UninstallString -ArgumentList "/S" -Wait } - else - { - if ((Test-Path $CleanedUninstallString)) - { + else { + if ((Test-Path $CleanedUninstallString)) { $Inno = Select-String -Path $CleanedUninstallString -Pattern "Inno Setup" } - if ($Inno) - { + if ($Inno) { #Inno x64 Installer Start-Process $UninstallString -ArgumentList "/VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-" -Wait } - else - { + else { Write-Host "$(if($true -eq $x64) {'x64'} else {'x86'}) Uninstaller unknown, trying the UninstallString from registry..." $NativeUninstallString = Select-String "(\x22.*\x22) +(.*)" -inputobject $UninstallString $Command = $NativeUninstallString.matches.groups[1].value @@ -151,8 +132,7 @@ Function Process-installedSoftware() } } $app_was_found = $true - if (!$AllVersions) - { + if (!$AllVersions) { break } } diff --git a/Sources/Winget-AutoUpdate/mods/_WAU-notinstalled-template.ps1 b/Sources/Winget-AutoUpdate/mods/_WAU-notinstalled-template.ps1 index 207eec5..983ab11 100644 --- a/Sources/Winget-AutoUpdate/mods/_WAU-notinstalled-template.ps1 +++ b/Sources/Winget-AutoUpdate/mods/_WAU-notinstalled-template.ps1 @@ -16,11 +16,11 @@ This all-purpose mod will be overridden by any specific: <# MAIN #> if ($($app.Id) -eq "Microsoft.SQLServerManagementStudio") { if ($ConfirmInstall -eq $false) { - try { - Write-ToLog "...succesfully done something" "Green" + try { + Write-ToLog "...succesfully done something" "Green" } catch { - Write-ToLog "...failed to do something" "Red" + Write-ToLog "...failed to do something" "Red" } } }