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

Desktop: Cleaning up the install / update script #2719

Merged
merged 4 commits into from
Mar 28, 2020
Merged

Desktop: Cleaning up the install / update script #2719

merged 4 commits into from
Mar 28, 2020

Conversation

mrwulf
Copy link
Contributor

@mrwulf mrwulf commented Mar 10, 2020

  • New --force option always downloads the latest version
  • New --notes option shows the release notes
  • Actually print the version installed at the end
  • Show download progress, but not extra garbage
  • Blue logo

@mrwulf
Cleaning up the install script
bd3ffcf 
* New `--force` option always downloads the latest version
* New `--notes` option shows the release notes
* Actually print the version installed at the end
* Show download progress, but not extra garbage
* Blue logo
@tessus tessus added the linux label Mar 10, 2020
@laurent22
Copy link
Owner

Looks good to me. Is it common to use --notes for release notes? I'd use --changelog because "notes" can mean other things.

@tessus
Copy link
Collaborator

tessus commented Mar 13, 2020

There's no specific argument in the Unix world for that. Both are perfectly valid.
But if you prefer --changelog, I can change it and then merrge.

@mrwulf
Copy link
Contributor Author

mrwulf commented Mar 13, 2020 via email

@tessus
Copy link
Collaborator

tessus commented Mar 13, 2020

Thanks for your reply @mrwulf. Let's see what Laurent wants to do.

@tessus
Copy link
Collaborator

tessus commented Mar 14, 2020

@laurent22 if we could have your input, we'd be able to merge this today.

@laurent22
Copy link
Owner

Also would it make sense to add a help page, now that there are options? Something that will show up when running --help.

@mrwulf
Copy link
Contributor Author

mrwulf commented Mar 16, 2020

OK, I went a little crazy refactoring. Here are the highlights:

  • Switched --notes to --changelog
  • Added more complete argument parsing
  • Added a --help argument to show usage
  • Fixed the --force option to not actually remove the ~/.joplin/VERSION file until the new version is being installed
  • Download the new version to a temp directory (doesn't leave joplin unusable if the download fails or is cancelled)
  • Show the current and desired versions

@tessus
Copy link
Collaborator

tessus commented Mar 16, 2020

Great, thanks for the changes.

@tessus tessus mentioned this pull request Mar 27, 2020
Merged
@tessus
Copy link
Collaborator

tessus commented Mar 28, 2020

@mrwulf I'm sorry, but there was a change to the same file and there's a conflict now.
Any chance you can fix it and then I am allowed to merge.

@mrwulf
Copy link
Contributor Author

mrwulf commented Mar 28, 2020

Thanks- updated!

@tessus
Copy link
Collaborator

tessus commented Mar 28, 2020

Great, thank you.

@tessus tessus merged commit d54e52b into laurent22:master Mar 28, 2020
lpmi-13 added a commit to lpmi-13/joplin that referenced this pull request Mar 28, 2020
@lpmi-13
Desktop: Cleaning up the install / update script (laurent22#2719)
51cbc3d 
    * Cleaning up the install script

    * New `--force` option always downloads the latest version
    * New `--notes` option shows the release notes
    * Actually print the version installed at the end
    * Show download progress, but not extra garbage
    * Blue logo

    * refactor and cleanup

    * Handle space, but no args
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
linux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mrwulf @laurent22 @tessus