From 716200e7dfcfb8f0e2bd4623c574dd31a8f562bb Mon Sep 17 00:00:00 2001
From: SuperSonic16 <25761885+thesupersonic16@users.noreply.github.com>
Date: Thu, 27 Feb 2025 04:22:29 +1100
Subject: [PATCH] Updated flatpak build script (#467)

---
 .github/workflows/build-flatpak.yml           | 13 ++++++----
 .../io.github.hedge_dev.unleashedrecomp.json  | 25 -------------------
 2 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/build-flatpak.yml b/.github/workflows/build-flatpak.yml
index c2c3c24..9a2e0ff 100644
--- a/.github/workflows/build-flatpak.yml
+++ b/.github/workflows/build-flatpak.yml
@@ -14,30 +14,33 @@ jobs:
     runs-on: ubuntu-24.04
 
     steps:
-      - name: Checkout repository
+      - name: Checkout Repository
         uses: actions/checkout@v4
         with:
           submodules: recursive
           token: ${{ secrets.ORG_TOKEN }}
 
-      - name: Checkout private repository
+      - name: Checkout Private Repository
         uses: actions/checkout@v4
         with:
           repository: ${{ secrets.ASSET_REPO }}
           token: ${{ secrets.ASSET_REPO_TOKEN }}
-          path: flatpak/private
+          path: ./private
 
-      - name: Install dependencies
+      - name: Install Dependencies
         run: |-
           sudo apt update
           sudo apt install -y flatpak-builder ccache
 
-      - name: Cache ccache directory
+      - name: Setup ccache
         uses: actions/cache@v4
         with:
           path: /tmp/ccache
           key: ccache-${{ runner.os }}
 
+      - name: Prepare Project
+        run: cp ./private/* ./UnleashedRecompLib/private  
+
       - name: Prepare Flatpak
         run: |
           flatpak --user remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
diff --git a/flatpak/io.github.hedge_dev.unleashedrecomp.json b/flatpak/io.github.hedge_dev.unleashedrecomp.json
index a61c952..f6ae932 100644
--- a/flatpak/io.github.hedge_dev.unleashedrecomp.json
+++ b/flatpak/io.github.hedge_dev.unleashedrecomp.json
@@ -32,31 +32,6 @@
         {
           "type": "dir",
           "path": "../"
-        },
-        {
-          "type": "file",
-          "path": "private/default.xex",
-          "dest": "UnleashedRecompLib/private"
-        },
-        {
-          "type": "file",
-          "path": "private/default.xexp",
-          "dest": "UnleashedRecompLib/private"
-        },
-        {
-          "type": "file",
-          "path": "private/default_patched.xex",
-          "dest": "UnleashedRecompLib/private"
-        },
-        {
-          "type": "file",
-          "path": "private/shader.ar",
-          "dest": "UnleashedRecompLib/private"
-        },
-        {
-          "type": "file",
-          "path": "private/shader_decompressed.ar",
-          "dest": "UnleashedRecompLib/private"
         }
       ],
       "build-options": {