Skip to content

Commit

Permalink
Merge pull request #723 from aaronparker/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
aaronparker authored Jul 29, 2024
2 parents 8eaf08e + dd4e72f commit e730504
Show file tree
Hide file tree
Showing 33 changed files with 288 additions and 106 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ body:
id: documentation
attributes:
label: Have you reviewed the documentation?
description: "Please confirm that you've reviewed the following links:"
description: "Please confirm that you've reviewed the following links:"
options:
- label: "Troubleshooting at: https://stealthpuppy.com/evergreen/troubleshoot/"
- label: "Known issues at: https://stealthpuppy.com/evergreen/issues/"
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ body:
id: documentation
attributes:
label: Have you reviewed the documentation?
description: "Please confirm that you've reviewed the documentation before making this feature request."
description: "Please confirm that you've reviewed the documentation before making this feature request."
options:
- label: "Documentation at: https://stealthpuppy.com/evergreen/"
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/new-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ body:
id: documentation
attributes:
label: "Have you reviewed the list of supported applications?"
description: "Please confirm that you've reviewed the list of currently supported before making this application request."
description: "Please confirm that you've reviewed the list of currently supported before making this application request."
options:
- label: "Supported apps at: https://stealthpuppy.com/evergreen/apps/"
required: true
27 changes: 27 additions & 0 deletions Evergreen/Apps/Get-OBSStudioAlt.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
Function Get-OBSStudioAlt {
<#
.SYNOPSIS
Get the current version and download URI for OBS Studio.
.NOTES
Author: Kirill Trofimov
#>
[OutputType([System.Management.Automation.PSObject])]
[Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSUseSingularNouns", "", Justification="Product name is a plural")]
[CmdletBinding(SupportsShouldProcess = $False)]
param (
[Parameter(Mandatory = $False, Position = 0)]
[ValidateNotNull()]
[System.Management.Automation.PSObject]
$res = (Get-FunctionResource -AppName ("$($MyInvocation.MyCommand)".Split("-"))[1])
)

# 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
}
12 changes: 6 additions & 6 deletions Evergreen/Evergreen.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@ PowerShellVersion = '3.0'
# NestedModules = @()

# Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
FunctionsToExport = @('Export-EvergreenApp', 'Export-EvergreenManifest',
'Find-EvergreenApp', 'Get-EvergreenApp', 'Get-EvergreenAppFromApi',
'Get-EvergreenEndpointFromApi', 'Get-EvergreenLibrary',
'Get-EvergreenLibraryApp', 'New-EvergreenLibrary',
'Save-EvergreenApp', 'Start-EvergreenLibraryUpdate',
FunctionsToExport = @('Export-EvergreenApp', 'Export-EvergreenManifest',
'Find-EvergreenApp', 'Get-EvergreenApp', 'Get-EvergreenAppFromApi',
'Get-EvergreenEndpointFromApi', 'Get-EvergreenLibrary',
'Get-EvergreenAppFromLibrary', 'New-EvergreenLibrary',
'Save-EvergreenApp', 'Start-EvergreenLibraryUpdate',
'Test-EvergreenApp')

# Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
Expand All @@ -83,7 +83,7 @@ CmdletsToExport = @()
# VariablesToExport = @()

# Aliases to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no aliases to export.
AliasesToExport = 'sea', 'gea', 'fea', 'tea', 'iea', 'Invoke-EvergreenLibraryUpdate',
AliasesToExport = 'sea', 'gea', 'fea', 'tea', 'iea', 'Invoke-EvergreenLibraryUpdate', 'Get-EvergreenLibraryApp',
'Invoke-EvergreenApp', 'Get-EvergreenEndpoint'

# DSC resources to export from this module
Expand Down
2 changes: 1 addition & 1 deletion Evergreen/EvergreenLibraryTemplate.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
{
"Name": "MicrosoftOneDrive",
"EvergreenApp": "MicrosoftOneDrive",
"Filter": "$_.Architecture -eq \"AMD64\" -and $_.Ring -eq \"Production\" -and $_.Throttle -eq \"10\""
"Filter": "$_.Architecture -eq \"x64\" -and $_.Ring -eq \"Production\" -and $_.Throttle -eq \"10\""
},
{
"Name": "MicrosoftEdge",
Expand Down
2 changes: 1 addition & 1 deletion Evergreen/Manifests/ArtifexGhostscript.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Name": "Artifex Ghostscript",
"Source": "https://www.ghostscript.com/",

"Get": {
"Uri": "https://api.github.com/repos/ArtifexSoftware/ghostpdl-downloads/releases/latest",
"MatchVersion": "(\\d+(\\.\\d+){1,4}).*",
Expand Down
2 changes: 1 addition & 1 deletion Evergreen/Manifests/Flameshot.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Name": "Flameshot",
"Source": "https://flameshot.org/",

"Get": {
"Uri": "https://api.github.com/repos/flameshot-org/flameshot/releases/latest",
"MatchVersion": "(\\d+(\\.\\d+){1,4}).*",
Expand Down
2 changes: 1 addition & 1 deletion Evergreen/Manifests/FreeFem.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Name": "FreeFem",
"Source": "https://freefem.org/",

"Get": {
"Uri": "https://api.github.com/repos/FreeFem/FreeFem-sources/releases/latest",
"MatchVersion": "(\\d+(\\.\\d+){1,4}).*",
Expand Down
2 changes: 1 addition & 1 deletion Evergreen/Manifests/Gephi.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Name": "Gephi",
"Source": "https://gephi.org/",

"Get": {
"Uri": "https://api.github.com/repos/gephi/gephi/releases/latest",
"MatchVersion": "(\\d+(\\.\\d+){1,4}).*",
Expand Down
2 changes: 1 addition & 1 deletion Evergreen/Manifests/Gimp.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"Download": {
"Uri": "https://download.gimp.org/mirror/pub/gimp/v#minorversion/windows/#filename",
"ReplaceFileName": "#filename",
"ReplaceVersion": "#minorversion"
"ReplaceVersion": "#minorversion"
}
},
"Install": {
Expand Down
2 changes: 1 addition & 1 deletion Evergreen/Manifests/MicrosoftTerminal.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"Get": {
"Uri": "https://api.github.com/repos/microsoft/terminal/releases/latest",
"MatchVersion": "(\\d+(\\.\\d+){1,4}).*",
"MatchFileTypes": "\\.msixbundle$"
"MatchFileTypes": "\\.exe$|\\.msi$|\\.msixbundle$|\\.zip$"
},
"Install": {
"Setup": "",
Expand Down
2 changes: 1 addition & 1 deletion Evergreen/Manifests/MiniZincIDE.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Name": "MiniZinc IDE",
"Source": "https://www.minizinc.org/",

"Get": {
"Uri": "https://api.github.com/repos/MiniZinc/MiniZincIDE/releases/latest",
"MatchVersion": "(\\d+(\\.\\d+){1,4}).*",
Expand Down
6 changes: 3 additions & 3 deletions Evergreen/Manifests/MozillaFirefox.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@
"Msi": "https://download.mozilla.org/?product=firefox-esr-msi-latest-ssl&os=#platform&lang=#language",
"Msix": "https://download.mozilla.org/?product=firefox-esr-msix-latest-ssl&os=#platform&lang=#language"
},
"FIREFOX_ESR_NEXT": {
"FIREFOX_ESR_NEXT": {
"Exe": "https://download.mozilla.org/?product=firefox-esr-next-latest-ssl&os=#platform&lang=#language",
"Msi": "https://download.mozilla.org/?product=firefox-esr-next-msi-latest-ssl&os=#platform&lang=#language",
"Msix": "https://download.mozilla.org/?product=firefox-esr-next-msix-latest-ssl&os=#platform&lang=#language"
},
"FIREFOX_DEVEDITION": {
"FIREFOX_DEVEDITION": {
"Exe": "https://download.mozilla.org/?product=firefox-devedition-latest-ssl&os=#platform&lang=#language",
"Msi": "https://download.mozilla.org/?product=firefox-devedition-msi-latest-ssl&os=#platform&lang=#language",
"Msix": "https://download.mozilla.org/?product=firefox-devedition-next-msix-latest-ssl&os=#platform&lang=#language"
},
"LATEST_FIREFOX_RELEASED_DEVEL_VERSION": {
"LATEST_FIREFOX_RELEASED_DEVEL_VERSION": {
"Exe": "https://download.mozilla.org/?product=firefox-beta-latest-ssl&os=#platform&lang=#language",
"Msi": "https://download.mozilla.org/?product=firefox-beta-msi-latest-ssl&os=#platform&lang=#language",
"Msix": "https://download.mozilla.org/?product=firefox-beta-next-msix-latest-ssl&os=#platform&lang=#language"
Expand Down
6 changes: 3 additions & 3 deletions Evergreen/Manifests/MozillaThunderbird.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
"Exe": "https://download.mozilla.org/?product=thunderbird-esr-latest-ssl&os=#platform&lang=#language",
"Msi": "https://download.mozilla.org/?product=thunderbird-esr-msi-latest-ssl&os=#platform&lang=#language"
},
"THUNDERBIRD_ESR_NEXT": {
"THUNDERBIRD_ESR_NEXT": {
"Exe": "https://download.mozilla.org/?product=thunderbird-esr-next-latest-ssl&os=#platform&lang=#language",
"Msi": "https://download.mozilla.org/?product=thunderbird-esr-next-msi-latest-ssl&os=#platform&lang=#language"
},
"LATEST_THUNDERBIRD_DEVEL_VERSION": {
"LATEST_THUNDERBIRD_DEVEL_VERSION": {
"Exe": "https://download.mozilla.org/?product=thunderbird-beta-latest-ssl&os=#platform&lang=#language",
"Msi": "https://download.mozilla.org/?product=thunderbird-beta-msi-latest-ssl&os=#platform&lang=#language"

}
},
"Msix": "http://archive.mozilla.org/pub/thunderbird/releases/#version/#platform/multi/Thunderbird%20Setup%20#version.msix",
Expand Down
2 changes: 1 addition & 1 deletion Evergreen/Manifests/MuseScore.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Name": "MuseScore",
"Source": "https://musescore.org/",

"Get": {
"Uri": "https://api.github.com/repos/musescore/MuseScore/releases/latest",
"MatchVersion": "(\\d+(\\.\\d+){1,4}).*",
Expand Down
23 changes: 23 additions & 0 deletions Evergreen/Manifests/OBSStudioAlt.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"Name": "OBS Studio Alt",
"Source": "https://obsproject.com/",
"Get": {
"Uri": "https://api.github.com/repos/obsproject/obs-studio/releases/latest",
"MatchVersion": "(\\d+(\\.\\d+){1,4}).*",
"MatchFileTypes": "\\.exe$|\\.zip$"
},
"Install": {
"Setup": "*.exe",
"Preinstall": "",
"Physical": {
"Arguments": "/S",
"PostInstall": [
]
},
"Virtual": {
"Arguments": "/S",
"PostInstall": [
]
}
}
}
2 changes: 1 addition & 1 deletion Evergreen/Manifests/Pandoc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Name": "Pandoc",
"Source": "https://pandoc.org/",

"Get": {
"Uri": "https://api.github.com/repos/jgm/pandoc/releases/latest",
"MatchVersion": "(\\d+(\\.\\d+){1,4}).*",
Expand Down
2 changes: 1 addition & 1 deletion Evergreen/Manifests/Praat.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Name": "Praat",
"Source": "https://www.fon.hum.uva.nl/praat/",

"Get": {
"Uri": "https://api.github.com/repos/praat/praat/releases/latest",
"MatchVersion": "(\\d+(\\.\\d+){1,4}).*",
Expand Down
2 changes: 1 addition & 1 deletion Evergreen/Manifests/Protege.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Name": "Protege",
"Source": "https://protege.stanford.edu/",

"Get": {
"Uri": "https://api.github.com/repos/protegeproject/protege-distribution/releases/latest",
"MatchVersion": "(\\d+(\\.\\d+){1,4}).*",
Expand Down
2 changes: 1 addition & 1 deletion Evergreen/Manifests/RDAnalyzer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Name": "Remote Desktop Analyzer",
"Source": "https://rdanalyzer.com/",

"Get": {
"Uri": "https://api.github.com/repos/RDAnalyzer/release/releases/latest",
"MatchVersion": "(\\d+(\\.\\d+){1,4}).*",
Expand Down
2 changes: 1 addition & 1 deletion Evergreen/Manifests/SafeExamBrowser.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Name": "Safe Exam Browser",
"Source": "https://safeexambrowser.org/",

"Get": {
"Uri": "https://api.github.com/repos/SafeExamBrowser/seb-win-refactoring/releases/latest",
"MatchVersion": "(\\d+(\\.\\d+){1,4}).*",
Expand Down
2 changes: 1 addition & 1 deletion Evergreen/Manifests/TeXstudio.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Name": "TeXstudio",
"Source": "https://www.texstudio.org/",

"Get": {
"Uri": "https://api.github.com/repos/texstudio-org/texstudio/releases/latest",
"MatchVersion": "(\\d+(\\.\\d+){1,4}).*",
Expand Down
2 changes: 1 addition & 1 deletion Evergreen/Manifests/WinMerge.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Name": "WinMerge",
"Source": "https://winmerge.org/",

"Get": {
"Uri": "https://api.github.com/repos/WinMerge/winmerge/releases/latest",
"MatchVersion": "(\\d+(\\.\\d+){1,4}).*",
Expand Down
2 changes: 1 addition & 1 deletion Evergreen/Private/Invoke-EvergreenWebRequest.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public class TrustAllCertsPolicy : ICertificatePolicy {
}
}
"@
Write-Verbose -Message "$($MyInvocation.MyCommand): Trust all certificates."
Write-Verbose -Message "$($MyInvocation.MyCommand): Trust all certificates."
[System.Net.ServicePointManager]::CertificatePolicy = New-Object -TypeName "TrustAllCertsPolicy"
}

Expand Down
2 changes: 2 additions & 0 deletions Evergreen/Public/Export-EvergreenApp.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,12 @@ function Export-EvergreenApp {
}

# Sort the content and keep unique versions
Write-Verbose -Message "$($MyInvocation.MyCommand): Input object count: $($InputObject.Count)"
$Properties = $InputObject | Get-Member | `
Where-Object { $_.MemberType -eq "NoteProperty" } | Select-Object -ExpandProperty "Name" -Unique | `
Sort-Object -Descending
$OutputObject = $InputObject | Select-Object -Unique -Property $Properties
Write-Verbose -Message "$($MyInvocation.MyCommand): Output object count: $($OutputObject.Count)"

# Export the data to file
$OutputObject | Sort-Object -Property @{ Expression = { [System.Version] $_.Version }; Descending = $false } -ErrorAction "SilentlyContinue" | `
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
function Get-EvergreenLibraryApp {
function Get-EvergreenAppFromLibrary {
<#
.EXTERNALHELP Evergreen-help.xml
#>
[OutputType([System.Management.Automation.PSObject])]
[Alias("Get-EvergreenLibraryApp")]
[CmdletBinding(SupportsShouldProcess = $false)]
param (
[Parameter(
Expand Down
Loading

0 comments on commit e730504

Please sign in to comment.