From f81a3b96a86698086cc6b0b71e7d4787405a05be Mon Sep 17 00:00:00 2001
From: "Jason N." <33561705+JasonN3@users.noreply.github.com>
Date: Mon, 25 Mar 2024 13:34:31 -0400
Subject: [PATCH] fix dir

---
 .gitignore              | 2 +-
 action.yml              | 4 ++--
 xorriso/gen_input.sh.in | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index dde3499..f116d91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,4 @@
 /lorax.conf
 /output
 /*.log
-
+/cache
\ No newline at end of file
diff --git a/action.yml b/action.yml
index 776bd2c..653b5e5 100644
--- a/action.yml
+++ b/action.yml
@@ -156,8 +156,8 @@ runs:
         flatpak install --system -y ${{ inputs.flatpak_remote_refs }} ${DIR_REFS}
         mv /flatpak/flatpak/repo/refs/heads/deploy/* /flatpak/flatpak/repo/refs/heads/
         rmdir /flatpak/flatpak/repo/refs/heads/deploy
-        cp -R /flatpak/flatpak /flatpak_dir/
-        ostree refs --repo=/flatpak_dir/flatpak/repo
+        cp -R /flatpak/flatpak/* /flatpak_dir/
+        ostree refs --repo=/flatpak_dir/repo
         EOF
         docker run --rm --privileged --entrypoint bash -e FLATPAK_SYSTEM_DIR=/flatpak/flatpak -e FLATPAK_TRIGGERSDIR=/flatpak/triggers --volume ${{ github.workspace }}/${FLATPAK_DIR}:/flatpak_dir ${image} /flatpak_dir/script.sh
         echo "flatpak_dir=${FLATPAK_DIR}" >> $GITHUB_OUTPUT
diff --git a/xorriso/gen_input.sh.in b/xorriso/gen_input.sh.in
index 6a9f521..4d91101 100644
--- a/xorriso/gen_input.sh.in
+++ b/xorriso/gen_input.sh.in
@@ -12,8 +12,8 @@ echo "-chmod 0444 EFI/BOOT/grub.cfg"
 
 if [[ -n "${FLATPAK_DIR}" ]]
 then
-    pushd ${FLATPAK_DIR} > /dev/null
-    for file in $(find)
+    pushd ${FLATPAK_DIR}/flatpak > /dev/null
+    for file in $(find *)
     do
         echo "-map $(pwd)/${file} flatpak/${file}"
         echo "-chmod 0444 flatpak/${file}"