-
Notifications
You must be signed in to change notification settings - Fork 5.8k
8301856: Generated .spec file for RPM installers uninstalls desktop launcher on update #16800
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.
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
8301856: Generated .spec file for RPM installers uninstalls desktop launcher on update #16800
Conversation
…auncher on update
👋 Welcome back asemenyuk! A progress list of the required criteria for merging this PR into |
src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/desktop_utils.sh
Show resolved
Hide resolved
@alexeysemenyukoracle The following label will be automatically applied to this pull request:
When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command. |
src/jdk.jpackage/linux/classes/jdk/jpackage/internal/resources/template.spec
Show resolved
Hide resolved
src/jdk.jpackage/unix/classes/jdk/jpackage/internal/UnixLaunchersAsServices.java
Show resolved
Hide resolved
test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherAsServiceVerifier.java
Show resolved
Hide resolved
@sashamatveev please review |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good.
@alexeysemenyukoracle This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be:
You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 109 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. ➡️ To integrate this PR with the above commit message to the |
/integrate |
Going to push as commit 7848ed7.
Your commit was automatically rebased without conflicts. |
@alexeysemenyukoracle Pushed as commit 7848ed7. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
Fix uninstallation scripts in Linux installers to take action on desktop files only if these desktop files are not owned by another package. This prevents
xdg-mime uninstall
,xdg-desktop-menu uninstall
commands from execution in case of upgrades.Borrowed helper shell script function from "launchers as services" for the fix. Now on Linux there is shared code between "launchers as services" and "desktop integration" subsystems - "common_utils.sh". Added
ServiceAndDesktopTest.java
to test how they align.Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/16800/head:pull/16800
$ git checkout pull/16800
Update a local copy of the PR:
$ git checkout pull/16800
$ git pull https://git.openjdk.org/jdk.git pull/16800/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 16800
View PR using the GUI difftool:
$ git pr show -t 16800
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/16800.diff
Webrev
Link to Webrev Comment