diff --git a/automatic/poppler/ReadMe.md b/automatic/poppler/ReadMe.md index 4d2f2a780..eccc874c2 100644 --- a/automatic/poppler/ReadMe.md +++ b/automatic/poppler/ReadMe.md @@ -1,3 +1,3 @@ # [Poppler](https://chocolatey.org/packages/poppler) -Poppler is a PDF rendering library based on the [xpdf-3.0](http://www.foolabs.com/xpdf) code base. \ No newline at end of file +Poppler is a PDF rendering library based on the [xpdf-3.0](http://www.foolabs.com/xpdf) code base. This version install the packaged zip from [oschwartz10612/poppler-windows](https://github.com/oschwartz10612/poppler-windows) which is built by [conda-forge/poppler-feedstock](https://github.com/conda-forge/poppler-feedstock). \ No newline at end of file diff --git a/automatic/poppler/poppler.nuspec b/automatic/poppler/poppler.nuspec index 1cd5313be..1399da13b 100644 --- a/automatic/poppler/poppler.nuspec +++ b/automatic/poppler/poppler.nuspec @@ -3,12 +3,13 @@ poppler - 26.05.0 + 26.02.0.0 https://github.com/chtof/chocolatey-packages/tree/master/automatic/poppler chtof Poppler Derek Noonburg, Albert Astals Cid. https://poppler.freedesktop.org + https://cgit.freedesktop.org/poppler/poppler/plain/COPYING @@ -27,4 +28,4 @@ - \ No newline at end of file + diff --git a/automatic/poppler/tools/chocolateyinstall.ps1 b/automatic/poppler/tools/chocolateyinstall.ps1 index 4c0a3b9e4..8c4ac8458 100644 --- a/automatic/poppler/tools/chocolateyinstall.ps1 +++ b/automatic/poppler/tools/chocolateyinstall.ps1 @@ -1,19 +1,15 @@ $ErrorActionPreference = 'Stop'; $toolsDir = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)" -$packageArgs = @{ - packageName = $env:ChocolateyPackageName - destination = "$toolsDir" - file64 = "$toolsDir\poppler-26.05.0.tar.xz" -} -Get-ChocolateyUnzip @packageArgs +$url = 'https://github.com/oschwartz10612/poppler-windows/releases/download/v26.02.0-0/Release-26.02.0-0.zip' +$checksum = '993e4a94376ed712fafc7058d724ea0b943d118bbd2305cd9ed55174eb85cda5' +$checksumType = 'sha256' -$packageArgs_tar = @{ - packageName = $env:ChocolateyPackageName - destination = "$toolsDir" - file64 = "$toolsDir\poppler-26.05.0.tar.xz" -Replace (".xz$","") # tar file +$packageArgs = @{ + packageName = $env:ChocolateyPackageName + unzipLocation = $toolsDir + Url64bit = $url + Checksum64 = $checksum + ChecksumType64 = $checksumType } -Get-ChocolateyUnzip @packageArgs_tar - -Remove-Item $packageArgs.file64 -Remove-Item $packageArgs_tar.file64 +Install-ChocolateyZipPackage @packageArgs diff --git a/automatic/poppler/update.ps1 b/automatic/poppler/update.ps1 index 37fd836f7..01a8d7bfd 100644 --- a/automatic/poppler/update.ps1 +++ b/automatic/poppler/update.ps1 @@ -1,33 +1,39 @@ -import-module au +import-module chocolatey-AU -function global:au_BeforeUpdate { Get-RemoteFiles -NoSuffix -Purge } +$releases = 'https://github.com/oschwartz10612/poppler-windows/releases/latest' +$Owner = $releases.Split('/') | Select-Object -Last 1 -Skip 3 +$repo = $releases.Split('/') | Select-Object -Last 1 -Skip 2 -function global:au_GetLatest { - #$releases = 'https://anaconda.org/conda-forge/poppler/files?sort=basename&sort_order=desc' - $releases = 'https://poppler.freedesktop.org' - $regex = 'poppler-(?[\d\.]+)(-.*)?.tar.(bz2|xz)$' - - - $url = (Invoke-WebRequest -Uri $releases -UseBasicParsing).links | ? href -match $regex | Select -First 1 - - return @{ - Version = $matches.Version - URL64 = 'https://poppler.freedesktop.org/' + $url.href - } -} function global:au_SearchReplace { - @{ + @{ "legal\VERIFICATION.txt" = @{ "(?i)(x64: ).*" = "`${1}$($Latest.URL64)" "(?i)(checksum type:\s+).*" = "`${1}$($Latest.ChecksumType64)" "(?i)(checksum64:).*" = "`${1} $($Latest.Checksum64)" } + + 'tools/chocolateyInstall.ps1' = @{ + "(^[$]url\s*=\s*)('.*')" = "`$1'$($Latest.URL64)'" + "(^[$]checksum\s*=\s*)('.*')" = "`$1'$($Latest.Checksum64)'" + "(^[$]checksumType\s*=\s*)('.*')" = "`$1'$($Latest.ChecksumType64)'" + } + } +} - "tools\chocolateyinstall.ps1" = @{ - "(?i)(^\s*file64\s*=\s*`"[$]toolsDir\\)(.*?)`"(.*?)$" = "`$1$($Latest.FileName64)`"`$3" - } - } +function global:au_GetLatest { + $tags = Get-GitHubRelease -OwnerName $Owner -RepositoryName $repo -Latest + $urls = $tags.assets.browser_download_url | Where-Object {$_ -match ".zip$"} + $url64 = $urls | Where-Object {$_ -match 'Release-'} + Update-Metadata -key "releaseNotes" -value $tags.html_url + $version = $tags.tag_name.Replace('v','').Replace('-','.') + if($tags.prerelease -match "true") { + $date = $tags.published_at.ToString("yyyyMMdd") + $version = "$version-pre$($date)" + } + + $Latest = @{ URL64 = $url64; Version = $version } + return $Latest } -update -ChecksumFor none \ No newline at end of file +update -NoCheckChocoVersion