From 97c3941d48164becdad609e9d374a9cf24348135 Mon Sep 17 00:00:00 2001 From: cube Date: Tue, 23 Jul 2024 22:56:22 +0200 Subject: [PATCH] remove desktop file during uninstall fix startup wm class --- .github/workflows/build.yml | 3 +- src/jpackage/resources-linux/postinst | 2 +- src/jpackage/resources-linux/prerm | 43 +++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 src/jpackage/resources-linux/prerm diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e05e614..79b06ff 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -157,7 +157,8 @@ jobs: - name: Tweak AppImage run: | - cp -v "oolitestarter/src/jpackage/resources-linux/OoliteStarter.desktop" "target/appimage/OoliteStarter${{ needs.semver.outputs.FLAVOR }}/lib/oolitestarter${{ needs.semver.outputs.FLAVOR2 }}-oolitestarter${{ needs.semver.outputs.FLAVOR2 }}.desktop" + mv "oolitestarter/src/jpackage/resources-linux/OoliteStarter.desktop" "oolitestarter/src/jpackage/resources-linux/OoliteStarter${{ needs.semver.outputs.FLAVOR }}.desktop" + #cp -v "oolitestarter/src/jpackage/resources-linux/OoliteStarter.desktop" "target/appimage/OoliteStarter${{ needs.semver.outputs.FLAVOR }}/lib/oolitestarter${{ needs.semver.outputs.FLAVOR2 }}-oolitestarter${{ needs.semver.outputs.FLAVOR2 }}.desktop" - name: Check status 2 run: | diff --git a/src/jpackage/resources-linux/postinst b/src/jpackage/resources-linux/postinst index 5d8175d..8d56165 100644 --- a/src/jpackage/resources-linux/postinst +++ b/src/jpackage/resources-linux/postinst @@ -24,7 +24,7 @@ LAUNCHER_AS_SERVICE_SCRIPTS case "$1" in configure) - xdg-desktop-menu install /opt/APPLICATION_PACKAGE/lib/APPLICATION_PACKAGE-APPLICATION_PACKAGE.desktop + xdg-desktop-menu install /opt/APPLICATION_PACKAGE/lib/APPLICATION_PACKAGE-*.desktop DESKTOP_COMMANDS_INSTALL LAUNCHER_AS_SERVICE_COMMANDS_INSTALL ;; diff --git a/src/jpackage/resources-linux/prerm b/src/jpackage/resources-linux/prerm new file mode 100644 index 0000000..9c50c51 --- /dev/null +++ b/src/jpackage/resources-linux/prerm @@ -0,0 +1,43 @@ +#!/bin/sh +# prerm script for APPLICATION_PACKAGE +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `upgrade' +# * `failed-upgrade' +# * `remove' `in-favour' +# * `deconfigure' `in-favour' +# `removing' +# +# for details, see https://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +echo $0 called with $* + +package_type=deb +#COMMON_SCRIPTS +DESKTOP_SCRIPTS +LAUNCHER_AS_SERVICE_SCRIPTS + +case "$1" in + remove|upgrade|deconfigure) + xdg-desktop-menu uninstall /opt/APPLICATION_PACKAGE/lib/APPLICATION_PACKAGE-APPLICATION_PACKAGE.desktop + DESKTOP_COMMANDS_UNINSTALL + LAUNCHER_AS_SERVICE_COMMANDS_UNINSTALL + ;; + + failed-upgrade) + ;; + + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +exit 0 \ No newline at end of file