From 8156d3e9f3804237b48e9b91df9dd5f4b37d9aa4 Mon Sep 17 00:00:00 2001
From: XargonWan <xargonwan@gmail.com>
Date: Thu, 16 Nov 2023 09:23:50 +0100
Subject: [PATCH 1/4] Configurator: fixed not running desktop file [skip ci]

---
 net.retrodeck.retrodeck.Configurator.desktop | 2 +-
 net.retrodeck.retrodeck.yml                  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/net.retrodeck.retrodeck.Configurator.desktop b/net.retrodeck.retrodeck.Configurator.desktop
index 89c01fff..1d45d4a4 100644
--- a/net.retrodeck.retrodeck.Configurator.desktop
+++ b/net.retrodeck.retrodeck.Configurator.desktop
@@ -4,7 +4,7 @@ GenericName=RetroDECK Configuration Utility
 Type=Application
 Comment=A handy tool to change common RetroDECK settings
 Icon=net.retrodeck.retrodeck
-Exec=/app/tools/configurator.sh
+Exec=/bin/bash /app/tools/configurator.sh
 Terminal=false
 StartupNotify=false
 Keywords=multi;engine;emulator;standalone;steam;deck
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 78880ccd..0008d74a 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -1334,6 +1334,7 @@ modules:
       # Desktop entries
       - cp net.retrodeck.retrodeck.desktop /app/share/applications/net.retrodeck.retrodeck.desktop
       - cp net.retrodeck.retrodeck.Configurator.desktop /app/share/applications/net.retrodeck.retrodeck.Configurator.desktop
+      - chmod +x net.retrodeck.retrodeck*desktop
 
       # Initializing default emulator configs
       - cp -r emu-configs ${FLATPAK_DEST}/retrodeck/emu-configs/

From a5b7e8e484184a28ac4554a9db79678abe5d7a03 Mon Sep 17 00:00:00 2001
From: XargonWan <xargonwan@gmail.com>
Date: Thu, 16 Nov 2023 09:58:30 +0100
Subject: [PATCH 2/4] Added retrodeck and configurator symlinks in /app/bin
 [skip ci]

---
 net.retrodeck.retrodeck.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 0008d74a..55a0fa83 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -1350,6 +1350,10 @@ modules:
       - mkdir -p ${FLATPAK_DEST}/share/appdata
       - cp net.retrodeck.retrodeck.appdata.xml ${FLATPAK_DEST}/share/appdata
 
+      # Creating symlinks for a prettier access
+      - ln -s /app/bin/retrodeck.sh /app/bin/retrodeck
+      - ln -s /app/tools/configurator.sh /app/bin/configurator
+
     sources:
       - type: git
         url: https://github.com/XargonWan/RetroDECK.git

From 759edeea305803c8a38851d8707f9e173dc4e938 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Thu, 16 Nov 2023 12:29:09 +0100
Subject: [PATCH 3/4] Revert "Update flatpak_build_bundle.sh"

---
 automation_tools/flatpak_build_bundle.sh | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/automation_tools/flatpak_build_bundle.sh b/automation_tools/flatpak_build_bundle.sh
index 0ad6ea4f..cef69eff 100755
--- a/automation_tools/flatpak_build_bundle.sh
+++ b/automation_tools/flatpak_build_bundle.sh
@@ -2,10 +2,8 @@
 
 # This is building the bundle RetroDECK.flatpak after the download and build steps are done
 
-if [[ "${GITHUB_REF##*/}" == "main" ]]; then
-    flatpak = "RetroDECK.flatpak"
+if [ "${GITHUB_REF##*/}" = "main" ]; then
+    flatpak build-bundle ${GITHUB_WORKSPACE}/local RetroDECK.flatpak net.retrodeck.retrodeck
 else
-    flatpak = "RetroDECK-cooker.flatpak"
-fi
-
-flatpak build-bundle "${GITHUB_WORKSPACE}/local" "${flatpak}" net.retrodeck.retrodeck
+    flatpak build-bundle ${GITHUB_WORKSPACE}/local RetroDECK-cooker.flatpak net.retrodeck.retrodeck
+fi
\ No newline at end of file

From 563613d6719f47f2d001130bb3f623a48dac14a2 Mon Sep 17 00:00:00 2001
From: XargonWan <xargonwan@gmail.com>
Date: Thu, 16 Nov 2023 16:14:45 +0100
Subject: [PATCH 4/4] APPDATA: removed . at the end of the summary to stick to
 Flathub standards. [skip ci]

---
 net.retrodeck.retrodeck.appdata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml
index 6e80f682..93affa66 100644
--- a/net.retrodeck.retrodeck.appdata.xml
+++ b/net.retrodeck.retrodeck.appdata.xml
@@ -4,7 +4,7 @@
    <id>net.retrodeck.retrodeck</id>
    <launchable type="desktop-id">net.retrodeck.retrodeck.desktop</launchable>
    <name>RetroDECK</name>
-   <summary>RetroDECK brings an environment to catalog and play your retro games directly on your Steam Deck.</summary>
+   <summary>RetroDECK brings an environment to catalog and play your retro games directly on your Steam Deck</summary>
    <developer_name>RetroDECK Team</developer_name>
    <url type="homepage">https://retrodeck.net</url>
    <url type="bugtracker">https://github.com/XargonWan/RetroDECK/issues</url>