Make build more flexible for stable/experimental using variables

OoliteProject · Jul 23, 2024 · d9a402a · d9a402a
1 parent 8d68cf4
commit d9a402a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,6 +23,7 @@ jobs:
       MACOS_MAJORMINORPATCH: ${{ steps.output1.outputs.MACOS_MAJORMINORPATCH }}
       DEBIAN_PKGVERSION: ${{ steps.output1.outputs.DEBIAN_PKGVERSION }}
       FLAVOR: ${{ steps.output1.outputs.FLAVOR }}
+      FLAVOR2: ${{ steps.output1.outputs.FLAVOR2 }}
     steps:
     - name: Checkout project
       uses: actions/checkout@v4
@@ -58,6 +59,7 @@ jobs:
         if [ "$GITHUB_REF_NAME" != "master" ]
         then
           echo "FLAVOR=_${GITHUB_REF_NAME}" >> "$GITHUB_OUTPUT"
+          echo "FLAVOR2=-${GITHUB_REF_NAME}" >> "$GITHUB_OUTPUT"
         fi
 
   build:
@@ -155,8 +157,7 @@ jobs:
 
     - name: Tweak AppImage
       run: |
-        cp -v "oolitestarter/src/jpackage/resources-linux/OoliteStarter.desktop" "target/appimage/OoliteStarter${{ needs.semver.outputs.FLAVOR }}/lib/oolitestarter-OoliteStarter.desktop"
-      # cp -v "oolitestarter/src/main/resources/images/OoliteStarter_Splashscreen_640x360.png" "target/appimage/OoliteStarter/lib/app/splash.png"
+        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/OoliteStarter.desktop b/src/jpackage/resources-linux/OoliteStarter.desktop
@@ -1,10 +1,11 @@
 [Desktop Entry]
-Name=OoliteStarter
-Comment=UI to manage Oolite, SaveGames and Expansions
-Exec=/opt/oolitestarter/bin/OoliteStarter
-Icon=/opt/oolitestarter/lib/OoliteStarter.png
+Name=APPLICATION_NAME
+Comment=APPLICATION_DESCRIPTION
+Exec=APPLICATION_LAUNCHER
+Icon=APPLICATION_ICON
 Terminal=false
 Type=Application
 Categories=Unknown
 MimeType=
 StartupWMClass=oolite-starter-MainFrame
+DESKTOP_MIMES
diff --git a/src/jpackage/resources-linux/postinst b/src/jpackage/resources-linux/postinst
@@ -1,5 +1,5 @@
 #!/bin/sh
-# postinst script for nexus
+# postinst script for OoliteStarter
 #
 # see: dh_installdeb(1)
 
@@ -19,9 +19,14 @@ set -e
 
 echo $0 called with $*
 
+package_type=deb
+LAUNCHER_AS_SERVICE_SCRIPTS
+
 case "$1" in
     configure)
-        xdg-desktop-menu install /opt/oolitestarter/lib/oolitestarter-OoliteStarter.desktop
+        xdg-desktop-menu install /opt/APPLICATION_PACKAGE/lib/APPLICATION_PACKAGE-APPLICATION_PACKAGE.desktop
+        DESKTOP_COMMANDS_INSTALL
+        LAUNCHER_AS_SERVICE_COMMANDS_INSTALL
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)