Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

(zotero) add 64-bit installer #2546

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

(zotero) add 64-bit installer #2546

wants to merge 8 commits into from

Conversation

teknowledgist
Copy link
Contributor

@teknowledgist teknowledgist commented Sep 30, 2024 •
edited
Loading

This adds the new install option for 64-bit Zotero and simplifies the update a bit.

Description

Modified the update.ps1 to grab both 32-bit and 64-bit installer URLs, download the EXEs and replace the information in the VERIFICATION.txt file. Modified chocolateyinstall.ps1 to install either 32-bit or 64-bit flavor of Zotero. Also simplified the VERIFICATION.txt file and chocolateyinstall.ps1 and chocolateyuninstall.ps1 files to require fewer (or no) edits via update.ps1. Re-arranged metadata in the .nuspec to match the order of a new package. Updated the LICENSE.txt file to match changes at the project.

Motivation and Context

32-bit Zotero works fine on 64-bit systems, but regularly pops up a dialog indicating that it's not the most efficient version for the environment. The upgrade from 32-bit to 64-bit is as simple as a re-install, so fixing this package to have both bit-levels was fairly straightforward.

How Has this Been Tested?

Installed the current, 32-bit-only, v7.0.5 package then upgraded to proposed v7.0.5.20240930 package with no trouble. Also installed the proposed package without upgrading. Uninstalls worked too.

This was on Win11 system with Chocolatey v2.3.0. There is no reason to suspect the official test environment would have any issues because the script functions are exactly the same, just with the addition of the 64-bit installer. I don't have ready access to the official test environment, so someone else will have to test that if it is absolutely necessary.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Migrated package (a package has been migrated from another repository)

Checklist:

  • My code follows the code style of this repository.
  • My change requires a change to documentation (this usually means the notes in the description of a package).
  • I have updated the documentation accordingly (this usually means the notes in the description of a package).
  • I have updated the package description and it is less than 4000 characters.
  • All files are up to date with the latest Contributing Guidelines
  • The added/modified package passed install/uninstall in the Chocolatey Test Environment(https://github.com/chocolatey-community/chocolatey-test-environment/). Note that we don't support the use of any other environment.
  • The changes only affect a single package (not including meta package).

@teknowledgist
Overhauled AHK script for v2
79ea2aa 
The Tixoti package has an "open" dependency on AutoHotKey.  V2 of AHK has significantly different syntax, so the script had to be rewritten.  This requires AHK v2 now, but it seems to be working.
@teknowledgist
Update chocolateyInstall.ps1
616cad3
@teknowledgist
(zotero) add 64-bit installer
f7be676 
This adds the new install option for 64-bit Zotero and simplifies the update a bit.
@AppVeyorBot
Copy link

✅ Package verification completed without issues. PR is now pending human review

@teknowledgist teknowledgist mentioned this pull request Sep 30, 2024
Open
2 tasks
@teknowledgist
Copy link
Contributor Author

I have now tested install and uninstall in the test-environment:

image

@AdmiringWorm AdmiringWorm linked an issue Oct 25, 2024 that may be closed by this pull request
(zotero) Package is 32-bit only, but 64-bit application/installer is available #2531
Open
2 tasks
@teknowledgist
Copy link
Contributor Author

Apologies for my ignorance here, but is there anything I need to (or can) do about the the All checks have failed and This branch has conflicts that must be resolved messages?

  1. I don't know what the "checks" are or what has failed.
  2. I don't understand what the conflicts are or why there are only 3 when 7 files are changed by the PR or how to resolve them.

Thanks.

AdmiringWorm
AdmiringWorm requested changes Oct 25, 2024
View reviewed changes
Copy link
Member

@AdmiringWorm AdmiringWorm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apologizes for taking so long to review the changes in this PR.

There quite a few changes I would like you to make.

In addition to these changes, please also rebase your PR, as well as update any existing commits to have the prefix (zotero) in front of them.

automatic/zotero/legal/LICENSE.txt Outdated Show resolved Hide resolved
automatic/zotero/legal/VERIFICATION.txt Outdated Show resolved Hide resolved
automatic/zotero/tools/chocolateyInstall.ps1 Outdated Show resolved Hide resolved
automatic/zotero/tools/chocolateyInstall.ps1 Outdated Show resolved Hide resolved
automatic/zotero/tools/chocolateyInstall.ps1 Outdated Show resolved Hide resolved
automatic/zotero/update.ps1 Outdated Show resolved Hide resolved
automatic/zotero/update.ps1 Outdated Show resolved Hide resolved
automatic/zotero/zotero.nuspec Outdated Show resolved Hide resolved
automatic/zotero/zotero.nuspec Outdated Show resolved Hide resolved
automatic/zotero/zotero.nuspec Outdated Show resolved Hide resolved
@AdmiringWorm
Copy link
Member

Apologies for my ignorance here, but is there anything I need to (or can) do about the the All checks have failed and This branch has conflicts that must be resolved messages?

  1. I don't know what the "checks" are or what has failed.
  2. I don't understand what the conflicts are or why there are only 3 when 7 files are changed by the PR or how to resolve them.

Thanks.

  1. The in this case is the appveyor build that runs on the PR, it is failing due to conflicts in the files.
  2. A conflict means that the file have changed in the repository you are attempting to create the PR into, and it can not be automatically resolved in this case. The files it mentions are the ones that are in conflict. I do not have any documentation at the moment, but do a google search on solving git conflicts (you will see these conflicts when doing a git rebase most likely).

@teknowledgist
Copy link
Contributor Author

Again, ignoramus here. I've adjusted the files in my fork/branch, but I don't know how to rebase it. Is it possible in the web GUI or in GitHub desktop?

Thanks.

@TheCakeIsNaOH
Copy link
Member

Again, ignoramus here. I've adjusted the files in my fork/branch, but I don't know how to rebase it. Is it possible in the web GUI or in GitHub desktop?

https://docs.github.com/en/desktop/working-with-your-remote-repository-on-github-or-github-enterprise/syncing-your-branch-in-github-desktop#rebasing-your-project-branch-onto-another-branch

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AdmiringWorm AdmiringWorm AdmiringWorm requested changes

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
0 - Waiting on User
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

(zotero) Package is 32-bit only, but 64-bit application/installer is available
5 participants
@teknowledgist @AppVeyorBot @AdmiringWorm @TheCakeIsNaOH @ZacharyVernec