diff --git a/manifest/x86_64/z/zotero.filelist b/manifest/x86_64/z/zotero.filelist index 13258a463..eab576fbe 100644 --- a/manifest/x86_64/z/zotero.filelist +++ b/manifest/x86_64/z/zotero.filelist @@ -1,4 +1,4 @@ -# Total size: 223767826 +# Total size: 223767930 /usr/local/bin/zotero /usr/local/share/applications/zotero.desktop /usr/local/share/fonts/TwemojiMozilla.ttf diff --git a/packages/zotero.rb b/packages/zotero.rb index 210f9c1b4..343a6181d 100644 --- a/packages/zotero.rb +++ b/packages/zotero.rb @@ -3,11 +3,11 @@ require 'package' class Zotero < Package description 'Zotero is a free, easy-to-use tool to help you collect, organize, annotate, cite, and share research.' homepage 'https://www.zotero.org/' - version '7.0.25' + version '7.0.24' license 'GPL-3' compatibility 'x86_64' source_url "https://download.zotero.org/client/release/#{version}/Zotero-#{version}_linux-x86_64.tar.bz2" - source_sha256 '3f98aebf6ed9aa637e8ec15c1417358f60e6164943a3ce2452ddf9354b8ca891' + source_sha256 'a9b78cb2ba163d29036ee7ec8b7c88ebae4370a3fbf5255d74949069ddb5d6a0' depends_on 'dbus_glib' depends_on 'gtk3' diff --git a/tools/version.rb b/tools/version.rb index f85b1398a..f2deae3e0 100755 --- a/tools/version.rb +++ b/tools/version.rb @@ -1,5 +1,5 @@ #!/usr/bin/env ruby -# version.rb version 3.1 (for Chromebrew) +# version.rb version 3.2 (for Chromebrew) OPTIONS = %w[-h --help -j --json -u --update-package-files -v --verbose] @@ -286,6 +286,7 @@ if filelist.length.positive? if Libversion.version_compare2(PackageUtils.get_clean_version(@pkg.version), upstream_version) == -1 if UPDATE_PACKAGE_FILES && !@pkg.name[/#{CREW_AUTOMATIC_VERSION_UPDATE_EXCLUSION_REGEX}/] && updatable_pkg[@pkg.name.to_sym] == 'Yes' file = File.read(filename) + FileUtils.cp filename, "#{filename}.bak" if file.sub!(PackageUtils.get_clean_version(@pkg.version), upstream_version.chomp).nil? versions_updated[@pkg.name.to_sym] = false else @@ -296,35 +297,54 @@ if filelist.length.positive? if !@pkg.source_sha256.nil? && @pkg.source_sha256.is_a?(Hash) && @pkg.source_sha256&.key?(ARCH.to_sym) # Get old hashes (@pkg.source_url.keys.map &:to_s).each do |arch| - puts "old source_url: #{@pkg.source_url[arch.to_sym]}" if VERBOSE + puts "old source_url: #{@pkg.source_url[arch.to_sym]}" if VERBOSE && !OUTPUT_JSON old_hash[arch] = @pkg.source_sha256[arch.to_sym] - puts "old hash: #{old_hash[arch]}" if VERBOSE + puts "old hash: #{old_hash[arch]}" if VERBOSE && !OUTPUT_JSON end File.write(filename, file) # Now get new hashes @pkg = Package.load_package(filename, true) (@pkg.source_url.keys.map &:to_s).each do |arch| - puts "new source_url: #{@pkg.source_url[arch.to_sym]}" if VERBOSE + puts "new source_url: #{@pkg.source_url[arch.to_sym]}" if VERBOSE && !OUTPUT_JSON + unless `curl -fsI #{@pkg.source_url[arch.to_sym]}`.lines.first.split[1] == '200' + versions_updated[@pkg.name.to_sym] = 'Bad Source' + puts "#{@pkg.source_url[arch.to_sym]} is a bad source".lightred if VERBOSE && !OUTPUT_JSON + if File.file?("#{filename}.bak") + FileUtils.cp "#{filename}.bak", filename + FileUtils.rm "#{filename}.bak" + end + next filename + end new_hash[arch] = `curl -Ls #{@pkg.source_url[arch.to_sym]} | sha256sum - | awk '{print $1}'`.chomp - puts "new hash: #{new_hash[arch]}" if VERBOSE + puts "new hash: #{new_hash[arch]}" if VERBOSE && !OUTPUT_JSON file.sub!(old_hash[arch], new_hash[arch]) end elsif !@pkg.source_sha256.nil? && !@pkg.source_sha256.is_a?(Hash) arch = :all # Get old hashes old_hash[arch] = @pkg.source_sha256 - puts "old source_url: #{@pkg.source_url}" if VERBOSE - puts "old hash: #{old_hash[arch]}" if VERBOSE + puts "old source_url: #{@pkg.source_url}" if VERBOSE && !OUTPUT_JSON + puts "old hash: #{old_hash[arch]}" if VERBOSE && !OUTPUT_JSON File.write(filename, file) # Now get new hashes @pkg = Package.load_package(filename, true) - puts "new source_url: #{@pkg.source_url}" if VERBOSE + puts "new source_url: #{@pkg.source_url}" if VERBOSE && !OUTPUT_JSON + unless `curl -fsI #{@pkg.source_url}`.lines.first.split[1] == '200' + versions_updated[@pkg.name.to_sym] = 'Bad Source' + puts "#{@pkg.source_url} is a bad source.".lightred if VERBOSE && !OUTPUT_JSON + if File.file?("#{filename}.bak") + FileUtils.cp "#{filename}.bak", filename + FileUtils.rm "#{filename}.bak" + end + next filename + end new_hash[arch] = `curl -Ls #{@pkg.source_url} | sha256sum - | awk '{print $1}'`.chomp - puts "new hash: #{new_hash[arch]}" if VERBOSE + puts "new hash: #{new_hash[arch]}" if VERBOSE && !OUTPUT_JSON file.sub!(old_hash[arch], new_hash[arch]) end File.write(filename, file) versions_updated[@pkg.name.to_sym] = true + FileUtils.rm "#{filename}.bak" if File.file?("#{filename}.bak") end if @pkg.binary_compression == 'tar.xz' && !@pkg.no_zstd?