Merge pull request #713 from aaronparker/apps

Apps
aaronparker · Jul 7, 2024 · 3dec74d · 3dec74d
2 parents 80eda24 + 58722e0
commit 3dec74d
Show file tree

Hide file tree

Showing 27 changed files with 446 additions and 114 deletions.
diff --git a/Evergreen/Apps/Get-OpenJDK.ps1 → Disabled/Get-OpenJDK.ps1 b/Evergreen/Apps/Get-OpenJDK.ps1 → Disabled/Get-OpenJDK.ps1
diff --git a/Evergreen/Manifests/OpenJDK.json → Disabled/OpenJDK.json b/Evergreen/Manifests/OpenJDK.json → Disabled/OpenJDK.json
diff --git a/Evergreen/Apps/Get-AkeoRufusAlt.ps1 b/Evergreen/Apps/Get-AkeoRufusAlt.ps1
@@ -18,7 +18,7 @@ function Get-AkeoRufusAlt {
     $UpdateFeedLines = $UpdateFeed -split "`n"
 
     # Match the version number
-    $Version = (($UpdateFeedLines | Select-String -Pattern "version").Line -split "=")[-1].Trim()
+    $Version = (($UpdateFeedLines | Select-String -Pattern "^version" -CaseSensitive).Line -split "=")[-1].Trim()
 
     # For each architecture, match the download URL and return to the pipeline
     foreach ($Architecture in $res.Get.Update.Architectures.GetEnumerator()) {

diff --git a/Evergreen/Apps/Get-AmazonCorretto.ps1 b/Evergreen/Apps/Get-AmazonCorretto.ps1
diff --git a/Evergreen/Apps/Get-AmazonCorretto11.ps1 b/Evergreen/Apps/Get-AmazonCorretto11.ps1
@@ -0,0 +1,19 @@
+function Get-AmazonCorretto11 {
+    <#
+        .NOTES
+            Author: Aaron Parker
+            Twitter: @stealthpuppy
+    #>
+    [OutputType([System.Management.Automation.PSObject])]
+    [CmdletBinding(SupportsShouldProcess = $false)]
+    param (
+        [Parameter(Mandatory = $false, Position = 0)]
+        [ValidateNotNull()]
+        [System.Management.Automation.PSObject]
+        $res = (Get-FunctionResource -AppName ("$($MyInvocation.MyCommand)".Split("-"))[1])
+    )
+
+    # Get the latest download
+    $Object = Get-AmazonCorretto -res $res
+    Write-Output -InputObject $Object
+}
diff --git a/Evergreen/Apps/Get-AmazonCorretto15.ps1 b/Evergreen/Apps/Get-AmazonCorretto15.ps1
@@ -0,0 +1,19 @@
+function Get-AmazonCorretto15 {
+    <#
+        .NOTES
+            Author: Aaron Parker
+            Twitter: @stealthpuppy
+    #>
+    [OutputType([System.Management.Automation.PSObject])]
+    [CmdletBinding(SupportsShouldProcess = $false)]
+    param (
+        [Parameter(Mandatory = $false, Position = 0)]
+        [ValidateNotNull()]
+        [System.Management.Automation.PSObject]
+        $res = (Get-FunctionResource -AppName ("$($MyInvocation.MyCommand)".Split("-"))[1])
+    )
+
+    # Get the latest download
+    $Object = Get-AmazonCorretto -res $res
+    Write-Output -InputObject $Object
+}
diff --git a/Evergreen/Apps/Get-AmazonCorretto16.ps1 b/Evergreen/Apps/Get-AmazonCorretto16.ps1
@@ -0,0 +1,19 @@
+function Get-AmazonCorretto16 {
+    <#
+        .NOTES
+            Author: Aaron Parker
+            Twitter: @stealthpuppy
+    #>
+    [OutputType([System.Management.Automation.PSObject])]
+    [CmdletBinding(SupportsShouldProcess = $false)]
+    param (
+        [Parameter(Mandatory = $false, Position = 0)]
+        [ValidateNotNull()]
+        [System.Management.Automation.PSObject]
+        $res = (Get-FunctionResource -AppName ("$($MyInvocation.MyCommand)".Split("-"))[1])
+    )
+
+    # Get the latest download
+    $Object = Get-AmazonCorretto -res $res
+    Write-Output -InputObject $Object
+}
diff --git a/Evergreen/Apps/Get-AmazonCorretto17.ps1 b/Evergreen/Apps/Get-AmazonCorretto17.ps1
@@ -0,0 +1,19 @@
+function Get-AmazonCorretto17 {
+    <#
+        .NOTES
+            Author: Aaron Parker
+            Twitter: @stealthpuppy
+    #>
+    [OutputType([System.Management.Automation.PSObject])]
+    [CmdletBinding(SupportsShouldProcess = $false)]
+    param (
+        [Parameter(Mandatory = $false, Position = 0)]
+        [ValidateNotNull()]
+        [System.Management.Automation.PSObject]
+        $res = (Get-FunctionResource -AppName ("$($MyInvocation.MyCommand)".Split("-"))[1])
+    )
+
+    # Get the latest download
+    $Object = Get-AmazonCorretto -res $res
+    Write-Output -InputObject $Object
+}
diff --git a/Evergreen/Apps/Get-AmazonCorretto20.ps1 b/Evergreen/Apps/Get-AmazonCorretto20.ps1
@@ -0,0 +1,19 @@
+function Get-AmazonCorretto20 {
+    <#
+        .NOTES
+            Author: Aaron Parker
+            Twitter: @stealthpuppy
+    #>
+    [OutputType([System.Management.Automation.PSObject])]
+    [CmdletBinding(SupportsShouldProcess = $false)]
+    param (
+        [Parameter(Mandatory = $false, Position = 0)]
+        [ValidateNotNull()]
+        [System.Management.Automation.PSObject]
+        $res = (Get-FunctionResource -AppName ("$($MyInvocation.MyCommand)".Split("-"))[1])
+    )
+
+    # Get the latest download
+    $Object = Get-AmazonCorretto -res $res
+    Write-Output -InputObject $Object
+}
diff --git a/Evergreen/Apps/Get-AmazonCorretto21.ps1 b/Evergreen/Apps/Get-AmazonCorretto21.ps1
@@ -0,0 +1,19 @@
+function Get-AmazonCorretto21 {
+    <#
+        .NOTES
+            Author: Aaron Parker
+            Twitter: @stealthpuppy
+    #>
+    [OutputType([System.Management.Automation.PSObject])]
+    [CmdletBinding(SupportsShouldProcess = $false)]
+    param (
+        [Parameter(Mandatory = $false, Position = 0)]
+        [ValidateNotNull()]
+        [System.Management.Automation.PSObject]
+        $res = (Get-FunctionResource -AppName ("$($MyInvocation.MyCommand)".Split("-"))[1])
+    )
+
+    # Get the latest download
+    $Object = Get-AmazonCorretto -res $res
+    Write-Output -InputObject $Object
+}
diff --git a/Evergreen/Apps/Get-AmazonCorretto22.ps1 b/Evergreen/Apps/Get-AmazonCorretto22.ps1
@@ -0,0 +1,19 @@
+function Get-AmazonCorretto22 {
+    <#
+        .NOTES
+            Author: Aaron Parker
+            Twitter: @stealthpuppy
+    #>
+    [OutputType([System.Management.Automation.PSObject])]
+    [CmdletBinding(SupportsShouldProcess = $false)]
+    param (
+        [Parameter(Mandatory = $false, Position = 0)]
+        [ValidateNotNull()]
+        [System.Management.Automation.PSObject]
+        $res = (Get-FunctionResource -AppName ("$($MyInvocation.MyCommand)".Split("-"))[1])
+    )
+
+    # Get the latest download
+    $Object = Get-AmazonCorretto -res $res
+    Write-Output -InputObject $Object
+}
diff --git a/Evergreen/Apps/Get-AmazonCorretto8.ps1 b/Evergreen/Apps/Get-AmazonCorretto8.ps1
@@ -0,0 +1,19 @@
+function Get-AmazonCorretto8 {
+    <#
+        .NOTES
+            Author: Aaron Parker
+            Twitter: @stealthpuppy
+    #>
+    [OutputType([System.Management.Automation.PSObject])]
+    [CmdletBinding(SupportsShouldProcess = $false)]
+    param (
+        [Parameter(Mandatory = $false, Position = 0)]
+        [ValidateNotNull()]
+        [System.Management.Automation.PSObject]
+        $res = (Get-FunctionResource -AppName ("$($MyInvocation.MyCommand)".Split("-"))[1])
+    )
+
+    # Get the latest download
+    $Object = Get-AmazonCorretto -res $res
+    Write-Output -InputObject $Object
+}
diff --git a/Evergreen/Apps/Get-AtlassianSourcetree.ps1 b/Evergreen/Apps/Get-AtlassianSourcetree.ps1
@@ -38,10 +38,11 @@ Function Get-AtlassianSourcetree {
         ForEach ($item in $res.Get.Download.Uri.GetEnumerator()) {
 
             # Build the output object; Output object to the pipeline
+            $Url = $res.Get.Download.Uri[$item.Key] -replace $res.Get.Download.ReplaceText, $Version
             $PSObject = [PSCustomObject] @{
                 Version = $Version
-                Type    = $item.Name
-                URI     = $res.Get.Download.Uri[$item.Key] -replace $res.Get.Download.ReplaceText, $Version
+                Type    = Get-FileType -File $Url
+                URI     = $Url
             }
             Write-Output -InputObject $PSObject
         }

diff --git a/Evergreen/Apps/Get-AutodeskFusion360.ps1 b/Evergreen/Apps/Get-AutodeskFusion360.ps1
@@ -25,8 +25,8 @@ Function Get-AutodeskFusion360 {
             # Build object and output to the pipeline
             $PSObject = [PSCustomObject] @{
                 Version           = $Versions.'build-version'
-                BuildVersion      = $Versions.'build-version'
-                MajorBuildVersion = $Versions.'major-update-version'
+                #BuildVersion      = $Versions.'build-version'
+                #MajorBuildVersion = $Versions.'major-update-version'
                 Type              = Get-FileType -File $Url
                 Filename          = (Split-Path -Path $Url -Leaf).Replace('%20', ' ')
                 URI               = $Url

diff --git a/Evergreen/Apps/Get-JabraDirect.ps1 b/Evergreen/Apps/Get-JabraDirect.ps1
@@ -23,7 +23,6 @@ Function Get-JabraDirect {
         $PSObject = [PSCustomObject] @{
             Version       = $Content.WindowsVersion
             Architecture  = "x64"
-            ReleaseNotes  = $Content.WindowsReleaseNotes
             Type          = Get-FileType -File $Content.WindowsDownload
             Sha256        = $Content.WindowsSHA256
             URI           = $Content.WindowsDownload

diff --git a/Evergreen/Apps/Get-PiriformCCleanerFree.ps1 b/Evergreen/Apps/Get-PiriformCCleanerFree.ps1
@@ -27,17 +27,17 @@ Function Get-PiriformCCleanerFree {
     if ($null -ne $Update) {
 
         # Grab the download link headers to find the file name
-        $params = @{
-            Uri          = $res.Get.Download.Uri
-            Method       = "Head"
-            ReturnObject = "Headers"
-        }
-        $Headers = Invoke-EvergreenWebRequest @params
-        $Filename = [RegEx]::Match($Headers['Content-Disposition'], $res.Get.Download.MatchFilename).Captures.Groups[1].Value
+        # $params = @{
+        #     Uri          = $res.Get.Download.Uri
+        #     Method       = "Head"
+        #     ReturnObject = "Headers"
+        # }
+        # $Headers = Invoke-EvergreenWebRequest @params
+        # $Filename = [RegEx]::Match($Headers['Content-Disposition'], $res.Get.Download.MatchFilename).Captures.Groups[1].Value
 
         $PSObject = [PSCustomObject] @{
             Version  = ($Update -split "\|")[2]
-            Filename = $Filename
+            Filename = (Split-Path -Path $($Update -split "\|")[-2] -Leaf)
             URI      = $res.Get.Download.Uri
         }
         Write-Output -InputObject $PSObject

diff --git a/Evergreen/Manifests/AmazonCorretto.json b/Evergreen/Manifests/AmazonCorretto.json
diff --git a/Evergreen/Manifests/AmazonCorretto11.json b/Evergreen/Manifests/AmazonCorretto11.json
@@ -0,0 +1,30 @@
+{
+    "Name": "Amazon Corretto 11",
+    "Source": "https://aws.amazon.com/corretto/",
+    "Get": {
+        "Update": {
+            "Uri": ""
+        },
+        "Download": {
+            "Uri": [
+                "https://corretto.aws/downloads/latest/amazon-corretto-11-x64-windows-jdk.msi",
+                "https://corretto.aws/downloads/latest/amazon-corretto-11-x86-windows-jdk.msi",
+                "https://corretto.aws/downloads/latest/amazon-corretto-11-x64-windows-jdk.zip",
+                "https://corretto.aws/downloads/latest/amazon-corretto-11-x86-windows-jdk.zip"
+            ],
+            "Property": "ResponseUri.Headers.Location",
+            "MatchVersion": "(\\d+(\\.\\d+){1,4})"
+        }
+    },
+    "Install": {
+        "Setup": "amazon-corretto-*.msi",
+        "Physical": {
+            "Arguments": "/install /passive /norestart",
+            "PostInstall": []
+        },
+        "Virtual": {
+            "Arguments": "/install /passive /norestart",
+            "PostInstall": []
+        }
+    }
+}
diff --git a/Evergreen/Manifests/AmazonCorretto15.json b/Evergreen/Manifests/AmazonCorretto15.json
@@ -0,0 +1,28 @@
+{
+    "Name": "Amazon Corretto 15",
+    "Source": "https://aws.amazon.com/corretto/",
+    "Get": {
+        "Update": {
+            "Uri": ""
+        },
+        "Download": {
+            "Uri": [
+                "https://corretto.aws/downloads/latest/amazon-corretto-15-x64-windows-jdk.msi",
+                "https://corretto.aws/downloads/latest/amazon-corretto-15-x64-windows-jdk.zip"
+            ],
+            "Property": "ResponseUri.Headers.Location",
+            "MatchVersion": "(\\d+(\\.\\d+){1,4})"
+        }
+    },
+    "Install": {
+        "Setup": "amazon-corretto-*.msi",
+        "Physical": {
+            "Arguments": "/install /passive /norestart",
+            "PostInstall": []
+        },
+        "Virtual": {
+            "Arguments": "/install /passive /norestart",
+            "PostInstall": []
+        }
+    }
+}