diff --git a/action.yml b/action.yml index ae25bfb..497baf4 100644 --- a/action.yml +++ b/action.yml @@ -156,18 +156,13 @@ runs: flatpak remote-add --system ${{ inputs.flatpak_remote_name }} ${{ inputs.flatpak_remote_url }} flatpak install --system -y ${{ inputs.flatpak_remote_refs }} ${DIR_REFS} ostree init --repo=/flatpak_dir/repo --mode=archive-z2 - echo "all" - ostree refs --repo=/flatpak/flatpak/repo - echo "deploy" - ostree refs --repo=/flatpak/flatpak/repo | grep '^deploy/' - echo "replace" - ostree refs --repo=/flatpak/flatpak/repo | grep '^deploy/' | sed 's/^deploy\///g' - for i in \$(ostree refs --repo=/flatpak/flatpak/repo | grep '^deploy/' | sed 's/^deploy\///g') + for i in \$(ostree refs --repo=\${FLATPAK_SYSTEM_DIR}/repo | grep '^deploy/' | sed 's/^deploy\///g') do echo "Copying \${i}..." - ostree --repo=/flatpak_dir/repo pull-local /flatpak/flatpak/repo \$(ostree --repo=/flatpak/flatpak/repo rev-parse ${{ inputs.flatpak_remote_name }}/\${i})" + echo ostree --repo=/flatpak_dir/repo pull-local \${FLATPAK_SYSTEM_DIR}/repo \$(ostree --repo=\${FLATPAK_SYSTEM_DIR}/repo rev-parse ${{ inputs.flatpak_remote_name }}/\${i})" + ostree --repo=/flatpak_dir/repo pull-local \${FLATPAK_SYSTEM_DIR}/repo \$(ostree --repo=\${FLATPAK_SYSTEM_DIR}/repo rev-parse ${{ inputs.flatpak_remote_name }}/\${i})" mkdir -p \$(dirname /flatpak_dir/repo/refs/heads/\${i}) - ostree --repo=/flatpak/flatpak/repo rev-parse ${{ inputs.flatpak_remote_name }}/\${i} > /flatpak_dir/repo/refs/heads/\${i}" + ostree --repo=\${FLATPAK_SYSTEM_DIR}/repo rev-parse ${{ inputs.flatpak_remote_name }}/\${i} > /flatpak_dir/repo/refs/heads/\${i}" done flatpak build-update-repo /flatpak_dir/repo ostree refs --repo=/flatpak_dir/repo