From 5a6770b352908601162707a728074081b27fa1c4 Mon Sep 17 00:00:00 2001
From: Jason N <33561705+JasonN3@users.noreply.github.com>
Date: Fri, 22 Mar 2024 11:43:13 -0400
Subject: [PATCH] save location

---
 action.yml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/action.yml b/action.yml
index 954647f..86a0791 100644
--- a/action.yml
+++ b/action.yml
@@ -24,6 +24,10 @@ inputs:
     description: Whether to enable caching for skopeo
     required: false
     default: "false"
+  enable_flatpak_dependencies:
+    description: Whether to enable automatically determining Flatpak dependencies
+    required: false
+    default: "true"
   enrollment_password:
     description: Used for supporting secure boot (requires secure_boot_key_url to be defined)
     required: false
@@ -131,11 +135,13 @@ runs:
         mkdir /cache/skopeo || true
 
     - name: Determine Flatpak dependencies
+      if: inputs.enable_flatpak_dependencies == 'true'
+      id: flatpak_dependencies
       shell: bash
       run: |
         image="${{ inputs.image_repo }}/${{ inputs.image_name }}:${{ inputs.image_tag }}"
         # Make temp space
-        FLATPAK_DIR=$(mktemp -d)
+        FLATPAK_DIR=$(mktemp -d -p ${{ github.workspace }} flatpak.XXX)
         # Get list of refs from directory
         sudo mkdir /github || true
         sudo ln -s ${{ github.workspace }} /github/workspace
@@ -148,14 +154,12 @@ runs:
         flatpak config --system --set languages "*"
         flatpak remote-add --system ${{ inputs.flatpak_remote_name }} ${{ inputs.flatpak_remote_url }}
         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 -Rv /flatpak/flatpak /flatpak_dir/
         EOF
         docker run --privileged --entrypoint bash -e FLATPAK_SYSTEM_DIR=/flatpak/repo -e FLATPAK_TRIGGERSDIR=/flatpak/triggers --volume ${FLATPAK_DIR}:/flatpak_dir ${image} /flatpak_dir/script.sh
-        refs=$(ostree refs --repo=${FLATPAK_DIR}/flatpak/repo | grep '^deploy' | sed -i 's/^deploy\///g' | tr '\n' ' ')
-        for ref in ${refs}
-        do
-          echo "$ref"
-        done
+        echo "flatpak_dir=${FLATPAK_DIR}" >> $GITHUB_OUTPUT
 
     - name: Run docker image
       env:
@@ -210,6 +214,7 @@ runs:
           FLATPAK_REMOTE_NAME="${{ inputs.flatpak_remote_name }}" \
           ${vars} \
           FLATPAK_REMOTE_URL="${{ inputs.flatpak_remote_url }}" \
+          FLATPAK_DIR="${{ steps.flatpak_dependencies.outputs.flatpak_dir }}" \
           IMAGE_NAME="${{ inputs.image_name }}" \
           IMAGE_REPO="${{ inputs.image_repo }}" \
           IMAGE_TAG="${{ inputs.image_tag || inputs.version }}" \