From aa022dfd44d98bacb34d70732f5befe369e5b9ae Mon Sep 17 00:00:00 2001
From: "Jason N." <33561705+JasonN3@users.noreply.github.com>
Date: Thu, 7 Mar 2024 10:41:59 -0500
Subject: [PATCH] generalize search

---
 Makefile                                 | 13 +++++++++-
 lorax_templates/set_flatpak_repo.tmpl.in |  6 +++--
 tests/iso/os-release.sh                  | 17 -------------
 tests/iso/verify_flatpakrepo_updated.sh  | 31 ++++++++++++++++++++++++
 4 files changed, 47 insertions(+), 20 deletions(-)
 create mode 100644 tests/iso/verify_flatpakrepo_updated.sh

diff --git a/Makefile b/Makefile
index f15347a..2569ba2 100644
--- a/Makefile
+++ b/Makefile
@@ -189,8 +189,19 @@ test: test-iso test-vm
 
 test-iso:
 	$(eval _TESTS = $(filter-out README.md,$(shell ls tests/iso)))
+
+	sudo apt-get update
+	sudo apt-get install -y squashfs-tools
+	sudo mkdir /mnt/{iso,install}
+	sudo mount -o loop $iso /mnt/iso
+	sudo mount -t squashfs -o loop /mnt/iso/images/install.img /mnt/install
+
 	$(foreach test,$(_TESTS),chmod +x tests/iso/$(test))
-	$(foreach test,$(_TESTS),./tests/iso/$(test) deploy.iso)
+	$(foreach test,$(_TESTS),./tests/iso/$(test))
+
+	# Cleanup
+	sudo umount /mnt/install
+	sudo umount /mnt/iso
 
 test-vm:
 	$(eval _TESTS = $(filter-out README.md,$(shell ls tests/vm)))
diff --git a/lorax_templates/set_flatpak_repo.tmpl.in b/lorax_templates/set_flatpak_repo.tmpl.in
index 3d4667f..442c803 100644
--- a/lorax_templates/set_flatpak_repo.tmpl.in
+++ b/lorax_templates/set_flatpak_repo.tmpl.in
@@ -1,2 +1,4 @@
-replace "flatpak_manager\.add_remote\(\"fedora\", \"oci\+https://registry\.fedoraproject\.org\"\)" "flatpak_manager.add_remote(\"${flatpak_remote_name}\", \"${_flatpak_repo_url}\")" /usr/lib64/python3.12/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py
-replace "flatpak_manager\.replace_installed_refs_remote\(\"fedora\"\)" "flatpak_manager.replace_installed_refs_remote(\"${flatpak_remote_name}\")" /usr/lib64/python3.12/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py
+<%page args="flatpak_remote_name, _flatpak_repo_url"/>
+
+replace "flatpak_manager\.add_remote\(\".*\", \".*\"\)" "flatpak_manager.add_remote(\"${flatpak_remote_name}\", \"${_flatpak_repo_url}\")" /usr/lib64/python3.12/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py
+replace "flatpak_manager\.replace_installed_refs_remote\(\".*\"\)" "flatpak_manager.replace_installed_refs_remote(\"${flatpak_remote_name}\")" /usr/lib64/python3.12/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py
diff --git a/tests/iso/os-release.sh b/tests/iso/os-release.sh
index ea066bc..ccef46c 100644
--- a/tests/iso/os-release.sh
+++ b/tests/iso/os-release.sh
@@ -1,24 +1,7 @@
 #!/bin/bash
 
-iso=$1
-
-sudo apt-get update
-sudo apt-get install -y squashfs-tools
-
-sudo mkdir /mnt/{iso,install}
-
-# Mount ISO
-sudo mount -o loop $iso /mnt/iso
-
-# Mount squashfs
-sudo mount -t squashfs -o loop /mnt/iso/images/install.img /mnt/install
-
 FOUND_VERSION=$(cat /mnt/install/etc/os-release | grep VERSION_ID | cut -d= -f2)
 
-# Cleanup
-sudo umount /mnt/install
-sudo umount /mnt/iso
-
 if [[ ${FOUND_VERSION} != ${VERSION} ]]
 then
     echo "Version mismatch"
diff --git a/tests/iso/verify_flatpakrepo_updated.sh b/tests/iso/verify_flatpakrepo_updated.sh
new file mode 100644
index 0000000..0a13a81
--- /dev/null
+++ b/tests/iso/verify_flatpakrepo_updated.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+add_line=$(grep flatpak_manager.add_remote /mnt/install/usr/lib64/python3.12/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})
+
+result=0
+if [ -z "${add_line_repo}" ]
+then
+    echo "Repo name not updated"
+    result=1
+fi
+
+if [ -z "${add_line_url}" ]
+then
+    echo "Repo url not updated"
+    result=1
+fi
+
+replace_line=$(grep flatpak_manager.replace_installed_refs_remote /mnt/install/usr/lib64/python3.12/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py)
+
+replace_line_repo=$(echo ${replace_line} | grep ${FLATPAK_REMOTE_NAME})
+
+if [ -z "${replace_line_repo}" ]
+then
+    echo "Repo name not updated in second line"
+    result=1
+fi
+
+exit ${result}
\ No newline at end of file