From c49ee23d4fda4a62e7bfef4949847e0c9a8c6ef5 Mon Sep 17 00:00:00 2001
From: "Jason N." <33561705+JasonN3@users.noreply.github.com>
Date: Thu, 7 Mar 2024 16:00:17 -0500
Subject: [PATCH] export vars

---
 Makefile                                | 5 ++++-
 tests/iso/verify_flatpakrepo_updated.sh | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 540d6f9..750493d 100644
--- a/Makefile
+++ b/Makefile
@@ -147,7 +147,7 @@ boot.iso: $(_LORAX_TEMPLATES) $(_REPO_FILES)
 		$(foreach file,$(_REPO_FILES),--repo $(_BASE_DIR)/$(file)) \
 		$(foreach file,$(_LORAX_TEMPLATES),--add-template $(_BASE_DIR)/$(file)) \
 		$(foreach file,$(ADDITIONAL_TEMPLATES),--add-template $(file)) \
-    $(foreach file,$(_FLATPAK_TEMPLATES),--add-template $(file)) \
+		$(foreach file,$(_FLATPAK_TEMPLATES),--add-template $(file)) \
 		--rootfs-size $(ROOTFS_SIZE) \
 		$(foreach var,$(_TEMPLATE_VARS),--add-template-var "$(shell echo $(var) | tr '[:upper:]' '[:lower:]')=$($(var))") \
 		$(_BASE_DIR)/results/
@@ -192,6 +192,9 @@ test: test-iso test-vm
 
 test-iso:
 	$(eval _TESTS = $(filter-out README.md,$(shell ls tests/iso)))
+	$(eval _VARS = VERSION FLATPAK_REMOTE_NAME _FLATPAK_REPO_URL)
+
+	export $(foreach var,$(_VARS),$(var)=$($(var)))
 
 	sudo apt-get update
 	sudo apt-get install -y squashfs-tools
diff --git a/tests/iso/verify_flatpakrepo_updated.sh b/tests/iso/verify_flatpakrepo_updated.sh
index 1a0eb2f..1fcafeb 100644
--- a/tests/iso/verify_flatpakrepo_updated.sh
+++ b/tests/iso/verify_flatpakrepo_updated.sh
@@ -5,7 +5,7 @@ set -ex
 add_line=$(grep flatpak_manager.add_remote /mnt/install/usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py)
 
 add_line_repo=$(echo ${add_line} | grep ${FLATPAK_REMOTE_NAME})
-add_line_url=$(echo ${add_line} | grep ${_flatpak_repo_url})
+add_line_url=$(echo ${add_line} | grep ${_FLATPAK_REPO_URL})
 
 result=0
 if [ -z "${add_line_repo}" ]