From 163468d211d4a9872df494c514ab6f529b0546c7 Mon Sep 17 00:00:00 2001
From: Brenden Davidson <brenden@bdavidson.dev>
Date: Sun, 29 Jun 2025 13:22:37 -0500
Subject: [PATCH] Implement current suggestions

---
 .editorconfig                              | 5 +++++
 .github/workflows/release.yml              | 8 +++-----
 packaging/CMakeLists.txt                   | 4 ++--
 packaging/linux/isledecomp.desktop.in      | 4 +++-
 packaging/linux/isledecomp.metainfo.xml.in | 4 ++--
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index c8d511ec..05d09a66 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -14,3 +14,8 @@ trim_trailing_whitespace = true
 
 [{CMakeLists.txt,*.cmake}]
 indent_size = 2
+insert_final_newline = true
+
+[*.{json,xml.in,desktop.in}]
+indent_size = 2
+insert_final_newline = true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 31652584..21564472 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,9 +4,7 @@ on:
   push:
     branches:
       - master
-
-env:
-  APP_ID: org.legoisland.Isle
+      - flatpak
 
 jobs:
   build:
@@ -118,8 +116,8 @@ jobs:
       - name: Build Flatpak
         uses: flatpak/flatpak-github-actions/flatpak-builder@v6
         with:
-          bundle: ${{ env.APP_ID }}.${{ matrix.arch }}.flatpak
-          manifest-path: packaging/linux/flatpak/${{ env.APP_ID }}.json
+          bundle: org.legoisland.Isle.${{ matrix.arch }}.flatpak
+          manifest-path: packaging/linux/flatpak/org.legoisland.Isle.json
           arch: ${{ matrix.arch }}
   
   release:
diff --git a/packaging/CMakeLists.txt b/packaging/CMakeLists.txt
index 540065ef..9994b0c0 100644
--- a/packaging/CMakeLists.txt
+++ b/packaging/CMakeLists.txt
@@ -6,9 +6,9 @@ set(APP_SPDX "LGPL-3.0-or-later")
 string(TIMESTAMP BUILD_DATE UTC)
 
 # The following will need to be refined if we wish to post actual releases to a repo such as Flathub
-if(DEFINED ENV{GITHUB_RUN_ATTEMPT})
+if(DEFINED ENV{GITHUB_ACTIONS} AND ENV{GITHUB_ACTIONS} EQUAL TRUE)
     # Use the sequential run# of the current pipeline when running in GH Actions
-    set(SEMANTIC_VERSION "${PROJECT_VERSION}~build$ENV{GITHUB_RUN_ATTEMPT}")
+    set(SEMANTIC_VERSION "${PROJECT_VERSION}~build$ENV{GITHUB_RUN_NUMBER}")
 else()
     # Don't worry about the build number for local builds
     set(SEMANTIC_VERSION "${PROJECT_VERSION}")
diff --git a/packaging/linux/isledecomp.desktop.in b/packaging/linux/isledecomp.desktop.in
index 1e24173f..a40c4a2a 100644
--- a/packaging/linux/isledecomp.desktop.in
+++ b/packaging/linux/isledecomp.desktop.in
@@ -28,8 +28,10 @@ Actions=play;configure
 
 [Desktop Action play]
 Name=Play Game
+Icon=currenttrack_play
 Exec=isle
 
 [Desktop Action configure]
 Name=Configure Settings
-Exec=config
+Icon=settings
+Exec=isle-config
diff --git a/packaging/linux/isledecomp.metainfo.xml.in b/packaging/linux/isledecomp.metainfo.xml.in
index 00e03700..528157af 100644
--- a/packaging/linux/isledecomp.metainfo.xml.in
+++ b/packaging/linux/isledecomp.metainfo.xml.in
@@ -84,6 +84,6 @@
   </keywords>
 
   <releases>
-    <release version="@SEMANTIC_VERSION@" type="development" date="@BUILD_DATE@"/>
+    <release version="@SEMANTIC_VERSION@" type="development" date="@BUILD_DATE@" />
   </releases>
-</component>
\ No newline at end of file
+</component>