From 08326b8a6a73d4a623fee1383156e0549ab8968f Mon Sep 17 00:00:00 2001
From: "Jason N." <33561705+JasonN3@users.noreply.github.com>
Date: Tue, 2 Apr 2024 22:33:03 -0400
Subject: [PATCH] paths

---
 .gitignore           |  1 +
 Makefile             |  2 +-
 flatpaks/Makefile    | 11 +++++++----
 xorriso/gen_input.sh |  8 ++++----
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 642219d..72aa711 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 /debugdata
 /build
+/flatpaks/script.sh
 /lorax_templates/post_*
 /pkglists
 /repos/*.repo
diff --git a/Makefile b/Makefile
index 6633f76..2b4c28e 100644
--- a/Makefile
+++ b/Makefile
@@ -65,7 +65,7 @@ _LORAX_TEMPLATES += $(call get_templates,flatpak)
 _TEMPLATE_VARS   += FLATPAK_DIR FLATPAK_REMOTE_NAME FLATPAK_REMOTE_REFS FLATPAK_REMOTE_URL _FLATPAK_REPO_GPG _FLATPAK_REPO_URL
 else
 ifneq ($(FLATPAK_REMOTE_REFS_DIR),)
-COLLECTED_REFS := $(foreach file,$(filter-out README.md Makefile,$(wildcard $(FLATPAK_REMOTE_REFS_DIR)/*)),$(shell cat $(file)))
+       COLLECTED_REFS      := $(foreach file,$(filter-out README.md Makefile,$(wildcard $(FLATPAK_REMOTE_REFS_DIR)/*)),$(shell cat $(file)))
 export FLATPAK_REMOTE_REFS += $(sort $(COLLECTED_REFS))
 endif
 
diff --git a/flatpaks/Makefile b/flatpaks/Makefile
index e6881b2..8176194 100644
--- a/flatpaks/Makefile
+++ b/flatpaks/Makefile
@@ -1,10 +1,12 @@
+IMAGE := $(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG)
+FLATPAK_DIR := $(if $(GITHUB_WORKSPACE),$(shell mktemp -d -p $(GITHUB_WORKSPACE) flatpak.XXX),$(PWD))
+
+.PHONY: full_list
 full_list: repo
-	cat list.txt >&2
+	cat $(FLATPAK_DIR)/list.txt >&2
 	
 
 repo: script.sh
-	$(eval IMAGE=$(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG))
-	$(eval FLATPAK_DIR=$(if $(GITHUB_WORKSPACE),$(shell mktemp -d -p $(GITHUB_WORKSPACE) flatpak.XXX),$(PWD)))
 	$(if $(GITHUB_WORKSPACE),cp script.sh $(FLATPAK_DIR)/)
 	docker run --rm --privileged --entrypoint bash -e FLATPAK_SYSTEM_DIR=/flatpak/flatpak -e FLATPAK_TRIGGERSDIR=/flatpak/triggers --volume $(FLATPAK_DIR):/flatpak_dir $(IMAGE) /flatpak_dir/script.sh
 	$(if $(GITHUB_OUTPUT),echo "flatpak_dir=$(FLATPAK_DIR)" >> $(GITHUB_OUTPUT))
@@ -12,6 +14,7 @@ repo: script.sh
 
 script.sh:
 	cat << EOF > script.sh
+	set -ex
 	mkdir -p /flatpak/flatpak /flatpak/triggers
 	mkdir /var/tmp || true
 	chmod -R 1777 /var/tmp
@@ -23,7 +26,7 @@ script.sh:
 	do
 	echo "Copying \$${i}..."
 	ostree --repo=/flatpak_dir/repo pull-local \$${FLATPAK_SYSTEM_DIR}/repo \$$(ostree --repo=\$${FLATPAK_SYSTEM_DIR}/repo rev-parse $(FLATPAK_REMOTE_NAME)/\$${i})
-	mkdir -p \$(dirname /flatpak_dir/repo/refs/heads/\${i})
+	mkdir -p \$$(dirname /flatpak_dir/repo/refs/heads/\$${i})
 	ostree --repo=\$${FLATPAK_SYSTEM_DIR}/repo rev-parse $(FLATPAK_REMOTE_NAME)/\$${i} > /flatpak_dir/repo/refs/heads/\$${i}
 	done
 	flatpak build-update-repo /flatpak_dir/repo
diff --git a/xorriso/gen_input.sh b/xorriso/gen_input.sh
index b0a793f..9f17bb6 100644
--- a/xorriso/gen_input.sh
+++ b/xorriso/gen_input.sh
@@ -6,7 +6,7 @@ echo "-outdev ${ISO_NAME}"
 echo "-boot_image any replay"
 echo "-joliet on"
 echo "-compliance joliet_long_names"
-pushd "${PWD}/results" > /dev/null
+pushd "${PWD}/../results" > /dev/null
 #for file in $(find . -type f)
 for file in ./boot/grub2/grub.cfg ./EFI/BOOT/grub.cfg
 do
@@ -14,14 +14,14 @@ do
     then
         continue
     fi
-    echo "-map ${PWD}/results/${file} ${file:2}"
+    echo "-map ${PWD}/../results/${file} ${file:2}"
     echo "-chmod 0444 ${file:2}"
 done
 popd > /dev/null
 
-if [[ -n "../${FLATPAK_DIR}" ]]
+if [[ -n "${FLATPAK_DIR}" ]]
 then
-    pushd "../${FLATPAK_DIR}" > /dev/null
+    pushd "${FLATPAK_DIR}" > /dev/null
     for file in $(find . -type f)
     do
         echo "-map ${PWD}/${file} flatpak/${file:2}"