chocolatey-community · teknowledgist · Sep 30, 2024
diff --git a/automatic/zotero/Readme.md b/automatic/zotero/Readme.md
@@ -3,4 +3,4 @@
 Zotero is free and open-source reference management software to manage bibliographic data and related research materials (such as PDF files). Notable features include web browser integration, online syncing, generation of in-text citations, footnotes and bibliographies, as well as integration with the word processors Microsoft Word, LibreOffice, OpenOffice.org Writer and NeoOffice.
 
 
-![screenshot](https://cdn.rawgit.com/chocolatey/chocolatey-coreteampackages/d1d9f0154e370315e49f245a26a7d23e89a705cc/automatic/zotero/screenshot.png)
+![screenshot](https://cdn.jsdelivr.net/gh/chocolatey-community/chocolatey-packages@53607633ce049d5d75ac668f4408faaeced36bc3/automatic/zotero/screenshot.png)
diff --git a/automatic/zotero/legal/LICENSE.txt b/automatic/zotero/legal/LICENSE.txt
@@ -1,12 +1,18 @@
-Zotero is Copyright © 2006, 2007, 2008, 2009, 2010, 2011
-Center for History and New Media, George Mason University,
+Obtained from:  https://raw.githubusercontent.com/zotero/zotero/refs/heads/main/COPYING
+=======================================================================================
+
+Zotero is Copyright © 2018 Corporation for Digital Scholarship, 
+Vienna, Virginia, USA http://digitalscholar.org
+
+Copyright © 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017
+Roy Rosenzweig Center for History and New Media, George Mason University,
 Fairfax, Virginia, USA  http://zotero.org
 
-The Center for History and New Media distributes the Zotero source code
+The Corporation for Digital Scholarship distributes the Zotero source code
 under the GNU Affero General Public License, version 3 (AGPLv3). The full text
 of this license is given below.
 
-The Zotero name is a registered trademark of George Mason University.
+The Zotero name is a registered trademark of the Corporation for Digital Scholarship.
 See http://zotero.org/trademark for more information.
 
 Third-party copyright in this distribution is noted where applicable.
@@ -676,3 +682,4 @@ specific requirements.
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU AGPL, see
 <http://www.gnu.org/licenses/>.
+
diff --git a/automatic/zotero/legal/VERIFICATION.txt b/automatic/zotero/legal/VERIFICATION.txt
@@ -2,17 +2,23 @@ VERIFICATION
 Verification is intended to assist the Chocolatey moderators and community
 in verifying that this package's contents are trustworthy.
 
-The embedded software have been downloaded from the listed download
-location on <https://www.zotero.org/download/> (The listed url gets redirected to another one)
-and can be verified by doing the following:
+Package can be verified like this:
 
-1. Download the following <https://download.zotero.org/client/release/7.0.5/Zotero-7.0.5_win32_setup.exe>
-2. Get the checksum using one of the following methods:
-  - Using powershell function 'Get-FileHash'
-  - Use chocolatey utility 'checksum.exe'
-3. The checksums should match the following:
+1. The installers can be obtained directly from:
 
-  checksum type: sha256
-  checksum: DA8E5516D57DDE80812E76E122B7A2E86EDB57B61C25D8AD107C50C8FA4E52F3
+   32-bit download: https://download.zotero.org/client/release/7.0.5/Zotero-7.0.5_win32_setup.exe
+   64-bit download: https://download.zotero.org/client/release/7.0.5/Zotero-7.0.5_x64_setup.exe
 
-The file 'LICENSE.txt' has been obtained from <https://github.com/zotero/zotero/blob/929288f9811a5026053ae154ca08cc4a9da13c52/COPYING>
+   to download the installer.
+
+2. The following methods can calculate the SHA256 checksum of what you download
+   to allow you to compare against the checksums below:
+   - Use powershell function 'Get-FileHash'
+   - Use Chocolatey utility 'checksum.exe'
+
+   32-bit checksum: DA8E5516D57DDE80812E76E122B7A2E86EDB57B61C25D8AD107C50C8FA4E52F3
+   64-bit checksum: 43017A16C5D6C9748C6615D51464B0CBD7E1E42FE49EBDD556B46E47932E4737
+
+
+The content of the file 'LICENSE.txt' is copied from:
+   https://raw.githubusercontent.com/zotero/zotero/refs/heads/main/COPYING
diff --git a/automatic/zotero/tools/chocolateyInstall.ps1 b/automatic/zotero/tools/chocolateyInstall.ps1
@@ -1,16 +1,20 @@
 $ErrorActionPreference = 'Stop'
 
-$toolsPath = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
+$toolsPath = Split-Path -parent $MyInvocation.MyCommand.Definition
+$Installers = Get-ChildItem -Path $toolsPath -Filter '*.exe' |
+                  Sort-Object lastwritetime | 
+                  Select-Object -Last 2 -ExpandProperty FullName
 
 $packageArgs = @{
-  packageName    = $env:ChocolateyPackageName
-  fileType       = 'exe'
-  silentArgs     = '/S'
-  validExitCodes = @(0)
-  softwareName   = 'Zotero'
-  file           = "$toolsPath\Zotero-7.0.5_win32_setup.exe"
+   packageName    = $env:ChocolateyPackageName
+   softwareName   = "$env:ChocolateyPackageName*"
+   fileType       = 'exe'
+   file           = $Installers | Where-Object {$_ -match "win32"}
+   file64         = $Installers | Where-Object {$_ -match "x64"}
+   silentArgs     = '/S'
+   validExitCodes = @(0)
 }
 
 Install-ChocolateyInstallPackage @packageArgs
 
-Remove-Item -Force -ea 0 "$toolsPath\*.exe","$toolsPath\*.ignore"
+Remove-Item $Installers -Force -ea 0
diff --git a/automatic/zotero/tools/chocolateyUninstall.ps1 b/automatic/zotero/tools/chocolateyUninstall.ps1
@@ -2,7 +2,7 @@
 
 $packageArgs = @{
   packageName   = $env:ChocolateyPackageName
-  softwareName  = 'Zotero'
+  softwareName  = "$env:ChocolateyPackageName*"
   fileType      = 'exe'
   silentArgs    = '/S'
   validExitCodes= @(@(0))

diff --git a/automatic/zotero/update.ps1 b/automatic/zotero/update.ps1
@@ -1,8 +1,7 @@
 Import-Module Chocolatey-AU
 Import-Module "$PSScriptRoot\..\..\scripts\au_extensions.psm1"
 
-$releases = 'https://www.zotero.org/download/client/dl?channel=release&platform=win32'
-$softwareName = 'Zotero'
+$releases = 'https://www.zotero.org/download/client/dl?channel=release&platform=win-x64'
 
 function global:au_BeforeUpdate { Get-RemoteFiles -Purge -NoSuffix }
 
@@ -11,32 +10,25 @@ function global:au_SearchReplace {
 
   @{
     ".\legal\VERIFICATION.txt" = @{
-      "(?i)(\s*1\..+)\<.*\>" = "`${1}<$($Latest.URL32)>"
-      "(?i)(^\s*checksum\s*type\:).*" = "`${1} $($Latest.ChecksumType32)"
-      "(?i)(^\s*checksum(32)?\:).*" = "`${1} $($Latest.Checksum32)"
-    }
-    ".\tools\chocolateyInstall.ps1" = @{
-      "(?i)^(\s*softwareName\s*=\s*)'.*'" = "`${1}'$softwareName'"
-      "(?i)(^\s*file\s*=\s*`"[$]toolsPath\\).*" = "`${1}$($Latest.FileName32)`""
-    }
-    ".\tools\chocolateyUninstall.ps1" = @{
-      "(?i)^(\s*softwareName\s*=\s*)'.*'" = "`${1}'$softwareName'"
-    }
-    ".\$($Latest.PackageName).nuspec" = @{
-      "(\<releaseNotes\>).*(\<\/releaseNotes\>)" = "`${1}https://www.zotero.org/support/$($version.Major).$($version.Minor)_changelog`${2}"
+      "(?i)(^\s*32-bit download\:).*" = "`${1} $($Latest.URL32)"
+      "(?i)(^\s*64-bit download\:).*" = "`${1} $($Latest.URL64)"
+      "(?i)(^\s*32-bit checksum\:).*" = "`${1} $($Latest.Checksum32)"
+      "(?i)(^\s*64-bit checksum\:).*" = "`${1} $($Latest.Checksum64)"
     }
   }
 }
 
 function global:au_GetLatest {
-    $url = Get-RedirectedUrl -url $releases
+   $url64 = Get-RedirectedUrl -url $releases
+   $url32 = $url64 -replace 'x64','win32'
 
-    $version  = $url -split '/' | Select-Object -Last 1 -Skip 1
+   $version  = $url64.split('/') | Where-Object {$_ -match '^[0-9.]+$'}
 
-    @{
-        Version      = $version
-        URL32        = $url
-    }
+   @{
+      Version      = $version
+      URL32        = $url32
+      URL64        = $url64
+   }
 }
 
-update -ChecksumFor none
+update -ChecksumFor none -force
diff --git a/automatic/zotero/zotero.nuspec b/automatic/zotero/zotero.nuspec
@@ -2,30 +2,32 @@
 <!-- Do not remove this test for UTF-8: if “Ω” doesn’t appear as greek uppercase omega letter enclosed in quotation marks, you should use an editor that supports UTF-8, not this one. -->
 <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
   <metadata>
+    <!-- == PACKAGE SPECIFIC SECTION == -->
     <id>zotero</id>
-    <title>Zotero</title>
+    <version>7.0.5.20240930</version>
+    <packageSourceUrl>https://github.com/chocolatey-community/chocolatey-packages/tree/master/automatic/zotero</packageSourceUrl>
     <owners>chocolatey-community</owners>
-    <version>7.0.5</version>
-    <authors>Center for History and New Media, et. al.</authors>
-    <summary>Zotero [zoh-TAIR-oh] is a free, easy-to-use tool to help you collect, organize, cite, and share your research sources. </summary>
-    <iconUrl>https://cdn.jsdelivr.net/gh/chocolatey-community/chocolatey-packages@53607633ce049d5d75ac668f4408faaeced36bc3/icons/zotero.png</iconUrl>
-    <!-- Do not touch the description here in the nuspec file. Description is imported during update from the Readme.md file -->
-    <description><![CDATA[Zotero is free and open-source reference management software to manage bibliographic data and related research materials (such as PDF files). Notable features include web browser integration, online syncing, generation of in-text citations, footnotes and bibliographies, as well as integration with the word processors Microsoft Word, LibreOffice, OpenOffice.org Writer and NeoOffice.
-
-
-![screenshot](https://cdn.rawgit.com/chocolatey/chocolatey-coreteampackages/d1d9f0154e370315e49f245a26a7d23e89a705cc/automatic/zotero/screenshot.png)
-]]></description>
+    <!-- == SOFTWARE SPECIFIC SECTION == -->
+    <title>Zotero</title>
+    <authors>The Corporation for Digital Scholarship and contributors</authors>
     <projectUrl>https://www.zotero.org/</projectUrl>
-    <tags>zotero references manager bibliography foss cross-platform admin</tags>
+    <iconUrl>https://cdn.jsdelivr.net/gh/chocolatey-community/chocolatey-packages@53607633ce049d5d75ac668f4408faaeced36bc3/icons/zotero.png</iconUrl>
     <copyright>2006-2011, Center for History and New Media, George Mason University, Fairfax, Virginia, USA</copyright>
     <licenseUrl>https://github.com/zotero/zotero/blob/master/COPYING</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <releaseNotes>https://www.zotero.org/support/._changelog</releaseNotes>
-    <packageSourceUrl>https://github.com/chocolatey-community/chocolatey-packages/tree/master/automatic/zotero</packageSourceUrl>
     <projectSourceUrl>https://www.zotero.org/support/dev/source_code</projectSourceUrl>
     <docsUrl>https://www.zotero.org/support</docsUrl>
     <mailingListUrl>https://forums.zotero.org/discussions</mailingListUrl>
     <bugTrackerUrl>https://github.com/zotero/zotero/issues</bugTrackerUrl>
+    <tags>zotero references manager bibliography citations research foss cross-platform embedded</tags>
+    <summary>Zotero [zoh-TAIR-oh] is a free, easy-to-use tool to help you collect, organize, cite, and share your research sources. </summary>
+    <!-- Do not touch the description here in the nuspec file. Description is imported during update from the Readme.md file -->
+    <description><![CDATA[Zotero is free and open-source reference management software to manage bibliographic data and related research materials (such as PDF files). Notable features include web browser integration, online syncing, generation of in-text citations, footnotes and bibliographies, as well as integration with the word processors Microsoft Word, LibreOffice, OpenOffice.org Writer and NeoOffice.
+
+
+![screenshot](https://cdn.jsdelivr.net/gh/chocolatey-community/chocolatey-packages@53607633ce049d5d75ac668f4408faaeced36bc3/automatic/zotero/screenshot.png)
+]]></description>
+    <releaseNotes>https://www.zotero.org/support/changelog</releaseNotes>
     <dependencies>
       <dependency id="chocolatey-core.extension" version="1.3.3" />
     </dependencies>