Merge pull request #130 from EUCPilots/Updates

Update scripts and manifests for improved functionality and accuracy

Author: aaronparker

Apps/Get-AdvancedInstaller.ps1

@@ -18,10 +18,11 @@ function Get-AdvancedInstaller {
         Uri       = $res.Get.Update.Uri
         UserAgent = $res.Get.Update.UserAgent
     }
-    $UpdateFeed = Invoke-EvergreenRestMethod @params
-    if ($null -ne $UpdateFeed) {
-
+    $response = Invoke-EvergreenWebRequest @params
+    if ($null -ne $response) {
+        
         # Convert the INI update feed to an object, replace strings that break conversion
+        $UpdateFeed = [System.Text.Encoding]::Unicode.GetString($response)
         $Updates = ConvertFrom-IniFile -InputObject ($UpdateFeed -replace ";aiu;", "" -replace "\[advinst", "[")
 
         # Get the latest version

Apps/Get-jrsoftwareInnoSetup.ps1

@@ -5,8 +5,6 @@ function Get-jrsoftwareInnoSetup {
 
         .NOTES
             Author: Andrew Cooper
-            Twitter: @adotcoop
-            based on Get-TelerikFiddlerEverywhere.ps1
     #>
     [OutputType([System.Management.Automation.PSObject])]
     [CmdletBinding(SupportsShouldProcess = $false)]
@@ -17,24 +15,12 @@ function Get-jrsoftwareInnoSetup {
         $res = (Get-FunctionResource -AppName ("$($MyInvocation.MyCommand)".Split("-"))[1])
     )
 
-    # Get the latest download
-    $Response = Resolve-SystemNetWebRequest -Uri $res.Get.Download.Uri
-
-    if ($null -ne $Response) {
-
-        # Extract the version information from the uri
-        try {
-            $Version = [RegEx]::Match($Response.ResponseUri.LocalPath, $res.Get.Download.MatchVersion).Captures.Groups[1].Value
-        }
-        catch {
-            throw "$($MyInvocation.MyCommand): Failed to extract the version information from the uri."
-        }
-
-        # Construct the output; Return the custom object to the pipeline
-        $PSObject = [PSCustomObject] @{
-            Version = $Version
-            URI     = $Response.ResponseUri.AbsoluteUri
-        }
-        Write-Output -InputObject $PSObject
+    # Pass the repo releases API URL and return a formatted object
+    $params = @{
+        Uri          = $res.Get.Uri
+        MatchVersion = $res.Get.MatchVersion
+        Filter       = $res.Get.MatchFileTypes
     }
+    $object = Get-GitHubRepoRelease @params
+    Write-Output -InputObject $object
 }

Manifests/ESETPROTECTServer.json

@@ -1,5 +1,5 @@
 {
-    "Name": "ESET Endpoint Antivirus",
+    "Name": "ESET PROTECT Server",
     "Source": "https://www.eset.com/au/business/solutions/endpoint-protection/",
     "Get": {
         "Update": {

Manifests/MicrosoftTeams.json

@@ -1,5 +1,5 @@
 {
-    "Name": "Microsoft Teams (new)",
+    "Name": "Microsoft Teams",
     "Source": "https://www.microsoft.com/teams",
     "Get": {
         "Update": {

Manifests/PritunlOpenVPNClient.json

@@ -2,7 +2,7 @@
 	"Name": "Pritunl OpenVPN Client",
 	"Source": "https://client.pritunl.com/",
 	"Get": {
-		"Uri": "https://api.github.com/repos/pritunl/pritunl-client-electron/releases/latest",
+		"Uri": "https://api.github.com/repos/pritunl/pritunl-client/releases/latest",
 		"MatchVersion": "(\\d+(\\.\\d+){1,4}).*",
 		"MatchFileTypes": "\\.exe$|\\.msi$"
 	}

Manifests/jrsoftwareInnoSetup.json

@@ -2,14 +2,9 @@
 	"Name": "jrsoftware InnoSetup",
 	"Source": "https://www.innosetup.com",
 	"Get": {
-		"Update": {
-			"Uri": ""
-		},
-		"Download": {
-			"Uri": "https://jrsoftware.org/download.php/is.exe",
-			"Property": "ResponseUri.Headers.Location",
-			"MatchVersion": "(\\d+(\\.\\d+){1,3})"
-		}
+		"Uri": "https://api.github.com/repos/jrsoftware/issrc/releases/latest",
+		"MatchVersion": "(\\d+(\\.\\d+){1,4}).*",
+		"MatchFileTypes": "\\.exe$|\\.msi$"
 	},
 	"Install": {
 		"Setup": "innosetup*.exe",