From 570e282526e373a914851d4c05beae9075901299 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Wed, 30 Aug 2023 15:09:11 +0200
Subject: [PATCH] Automated generation of flathub needed files and manifest

---
 .github/workflows/flathub_push_main.yml | 27 +++++++++++++---
 flathub.json                            |  3 --
 flathub.yml                             | 41 -------------------------
 3 files changed, 23 insertions(+), 48 deletions(-)
 delete mode 100644 flathub.json
 delete mode 100644 flathub.yml

diff --git a/.github/workflows/flathub_push_main.yml b/.github/workflows/flathub_push_main.yml
index 1b4bad8f..ef02c9f4 100644
--- a/.github/workflows/flathub_push_main.yml
+++ b/.github/workflows/flathub_push_main.yml
@@ -9,6 +9,7 @@ jobs:
   Pushing_main_into_flathub:
     runs-on: ubuntu-latest
     steps:
+
       - name: Pushing
         shell: bash
         run: |
@@ -47,17 +48,35 @@ jobs:
           # Copying only a few files as the others are cloned by git in retrodeck.sh
           cd $gits_folder/RetroDECK
           cp -rf \
-          'flathub.json' \
           'LICENSE' \
-          'flathub.yml' \
           'README.md' \
           $gits_folder/flathub/
 
           cd $gits_folder/flathub
           ls -lah
 
-          # manipulating manifest
-          mv flathub.yml net.retrodeck.retrodeck.yml
+          # Creating the manifest for flathub
+          manifest='net.retrodeck.retrodeck.yml'
+          sed -n '/cleanup/q;p' $gits_folder/RetroDECK/net.retrodeck.retrodeck.yml > $manifest
+          sed -i '/^[[:space:]]*#/d' $manifest
+          sed -i 's/[[:space:]]*#.*$//' $manifest
+          cat << EOF >> $manifest
+          modules:
+            - name: retrodeck
+              buildsystem: simple
+              build-commands:
+                - cp -rn files/* /app
+              sources:
+              - type: archive
+                url: https://artifacts.retrodeck.net/artifacts/RetroDECK-Artifact.tar.gz
+                sha256:  __SHA__
+          EOF
+
+          cat << EOF >> flathub.json
+          {
+            "only-arches": ["x86_64"]
+          }
+          EOF
 
           # Getting latest release name
           # version=$(\
diff --git a/flathub.json b/flathub.json
deleted file mode 100644
index 0b69b95e..00000000
--- a/flathub.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "only-arches": ["x86_64"]
-}
\ No newline at end of file
diff --git a/flathub.yml b/flathub.yml
deleted file mode 100644
index f0216f88..00000000
--- a/flathub.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-app-id: net.retrodeck.retrodeck
-runtime: org.kde.Platform
-runtime-version: 5.15-22.08
-sdk: org.kde.Sdk
-sdk-extensions:
-  - org.freedesktop.Sdk.Extension.llvm14    # Needed for rpcs3
-base: io.qt.qtwebengine.BaseApp             # Needed for Yuzu
-base-version: 5.15-22.08                    # Needed for Yuzu
-command: retrodeck.sh
-
-finish-args:
-  - --socket=fallback-x11
-  - --socket=wayland
-  - --socket=pulseaudio
-  - --share=ipc
-  - --share=network
-  - --device=all
-  - --filesystem=home # Needed to be able to relocate / remove / create symlink at ~/retrodeck
-  - --filesystem=/run/media
-  - --filesystem=/media
-  - --allow=multiarch
-  - --talk-name=org.freedesktop.ScreenSaver
-  - --talk-name=org.freedesktop.PowerManagement.Inhibit
-  - --talk-name=org.freedesktop.login1.Manager
-  - --filesystem=xdg-run/app/com.discordapp.Discord:create
-  # Dolphin
-  - --allow=bluetooth
-  # PPSSPP
-  # It allows an SDL application to specify its window class, which can be useful for window managers and desktop environments to identify and group similar windows
-  - --env=SDL_VIDEO_X11_WMCLASS=net.retrodeck.retrodeck
-  - --env=SDL_VIDEO_WAYLAND_WMCLASS=net.retrodeck.retrodeck
-
-modules:
-  - name: retrodeck
-    buildsystem: simple
-    build-commands:
-      - cp -rn files/* /app
-    sources:
-    - type: archive
-      url: https://artifacts.retrodeck.net/artifacts/RetroDECK-Artifact.tar.gz
-      sha256:  __SHA__
\ No newline at end of file