From f664008e4e5d78c6266b65e7195779ff9a42aaab Mon Sep 17 00:00:00 2001
From: qoijjj <129108030+qoijjj@users.noreply.github.com>
Date: Wed, 31 Jul 2024 21:49:54 -0700
Subject: [PATCH 1/4] feat: switch to rpm yafti

---
 modules/yafti/yafti.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules/yafti/yafti.sh b/modules/yafti/yafti.sh
index 992fb1e..82747ba 100644
--- a/modules/yafti/yafti.sh
+++ b/modules/yafti/yafti.sh
@@ -17,11 +17,14 @@ FIRSTBOOT_SCRIPT="${FIRSTBOOT_DATA}/launcher/login-profile.sh"
 PROFILED_DIR="/usr/etc/profile.d"
 FIRSTBOOT_LINK="${PROFILED_DIR}/ublue-firstboot.sh"
 
-echo "Installing python3-pip and libadwaita"
-rpm-ostree install python3-pip libadwaita
+# Fetch ublue COPR
+REPO="https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-${OS_VERSION}/ublue-os-staging-fedora-${OS_VERSION}.repo"
+wget "${REPO//[$'\t\r\n ']}" -P "/etc/yum.repos.d/"
 
-echo "Installing and enabling yafti"
-pip install --prefix=/usr yafti==0.8.0
+rpm-ostree install yafti
+
+# Remove ublue COPR
+rm /etc/yum.repos.d/ublue-os-staging-fedora-*.repo
 
 # If the profile.d directory doesn't exist, create it
 if [ ! -d "${PROFILED_DIR}" ]; then

From 0dfe1bb314da81899ddb307c891618c2a5ac5150 Mon Sep 17 00:00:00 2001
From: fiftydinar <65243233+fiftydinar@users.noreply.github.com>
Date: Thu, 1 Aug 2024 08:14:02 +0200
Subject: [PATCH 2/4] chore(yafti): Pin version to 0.8.0

Assures that users won't get suddenly get refactored yafti someday. It would also let us have more time to update yafti docs before merging updated yafti version.
---
 modules/yafti/yafti.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/yafti/yafti.sh b/modules/yafti/yafti.sh
index 82747ba..eff4ccf 100644
--- a/modules/yafti/yafti.sh
+++ b/modules/yafti/yafti.sh
@@ -21,7 +21,7 @@ FIRSTBOOT_LINK="${PROFILED_DIR}/ublue-firstboot.sh"
 REPO="https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-${OS_VERSION}/ublue-os-staging-fedora-${OS_VERSION}.repo"
 wget "${REPO//[$'\t\r\n ']}" -P "/etc/yum.repos.d/"
 
-rpm-ostree install yafti
+rpm-ostree install yafti-0.8.0
 
 # Remove ublue COPR
 rm /etc/yum.repos.d/ublue-os-staging-fedora-*.repo

From fd4c653d42ae6aecd6141f6a77b44a1af1fcc72a Mon Sep 17 00:00:00 2001
From: fiftydinar <65243233+fiftydinar@users.noreply.github.com>
Date: Thu, 1 Aug 2024 08:29:36 +0200
Subject: [PATCH 3/4] chore(ublue-update): Install topgrade as RPM instead
 using pip

---
 modules/bling/installers/ublue-update.sh | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/modules/bling/installers/ublue-update.sh b/modules/bling/installers/ublue-update.sh
index ffa8a85..cf1f054 100644
--- a/modules/bling/installers/ublue-update.sh
+++ b/modules/bling/installers/ublue-update.sh
@@ -27,17 +27,12 @@ if [[ -f "$RPM_OSTREE_CONFIG" ]]; then
 fi
 systemctl disable rpm-ostreed-automatic.timer
 
-# Install python3-pip if it's not already installed
-if ! rpm -q python3-pip > /dev/null; then
-    rpm-ostree install python3-pip
-fi
-
 # Fetch ublue COPR
 REPO="https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-${OS_VERSION}/ublue-os-staging-fedora-${OS_VERSION}.repo"
 wget "${REPO//[$'\t\r\n ']}" -P "/etc/yum.repos.d/"
 
 # topgrade is REQUIRED by ublue-update to install
-pip install --prefix=/usr topgrade
+rpm-ostree install topgrade
 rpm-ostree install ublue-update
 
 # Remove ublue COPR

From 2cd75093449f446a1feac3ae5af7e098e08aff66 Mon Sep 17 00:00:00 2001
From: fiftydinar <65243233+fiftydinar@users.noreply.github.com>
Date: Thu, 1 Aug 2024 09:39:37 +0200
Subject: [PATCH 4/4] fix(yafti): Make sure that ublue-os staging repo is
 always overwritten

Fixes build fails in Bluefin/Aurora-based images, since they disable this repo with same filename.
---
 modules/yafti/yafti.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/yafti/yafti.sh b/modules/yafti/yafti.sh
index eff4ccf..9ce5de0 100644
--- a/modules/yafti/yafti.sh
+++ b/modules/yafti/yafti.sh
@@ -19,7 +19,7 @@ FIRSTBOOT_LINK="${PROFILED_DIR}/ublue-firstboot.sh"
 
 # Fetch ublue COPR
 REPO="https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-${OS_VERSION}/ublue-os-staging-fedora-${OS_VERSION}.repo"
-wget "${REPO//[$'\t\r\n ']}" -P "/etc/yum.repos.d/"
+wget -O "/etc/yum.repos.d/ublue-os-staging-fedora-${OS_VERSION}.repo" "${REPO//[$'\t\r\n ']}"
 
 rpm-ostree install yafti-0.8.0