From 4fb05e3c0816474c55871ec76d294ba47772b448 Mon Sep 17 00:00:00 2001
From: bobslept <38557801+bobslept@users.noreply.github.com>
Date: Mon, 2 Oct 2023 23:27:47 +0200
Subject: [PATCH 1/2] fix: disable system flathub

---
 usr/bin/ublue-system-flatpak-manager | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/bin/ublue-system-flatpak-manager b/usr/bin/ublue-system-flatpak-manager
index 3b8fd846706..3f970649370 100755
--- a/usr/bin/ublue-system-flatpak-manager
+++ b/usr/bin/ublue-system-flatpak-manager
@@ -48,6 +48,7 @@ if grep -qz 'fedora' <<< $(flatpak remotes); then
   /usr/lib/fedora-third-party/fedora-third-party-opt-out
   /usr/bin/fedora-third-party disable
   flatpak remote-delete fedora --force
+  flatpak remote-modify flathub --disable --system
 
   FEDORA_FLATPAKS=$(flatpak list --columns=application,origin | grep -w 'fedora' | awk '{print $1}')
   for flatpak in $FEDORA_FLATPAKS; do

From f3a117529c05e544493cfe5d602b7bbe13e8fbcf Mon Sep 17 00:00:00 2001
From: bobslept <38557801+bobslept@users.noreply.github.com>
Date: Tue, 3 Oct 2023 00:09:24 +0200
Subject: [PATCH 2/2] fix: move it out of the if condition

---
 usr/bin/ublue-system-flatpak-manager | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/usr/bin/ublue-system-flatpak-manager b/usr/bin/ublue-system-flatpak-manager
index 3f970649370..a503caaa8ee 100755
--- a/usr/bin/ublue-system-flatpak-manager
+++ b/usr/bin/ublue-system-flatpak-manager
@@ -48,7 +48,6 @@ if grep -qz 'fedora' <<< $(flatpak remotes); then
   /usr/lib/fedora-third-party/fedora-third-party-opt-out
   /usr/bin/fedora-third-party disable
   flatpak remote-delete fedora --force
-  flatpak remote-modify flathub --disable --system
 
   FEDORA_FLATPAKS=$(flatpak list --columns=application,origin | grep -w 'fedora' | awk '{print $1}')
   for flatpak in $FEDORA_FLATPAKS; do
@@ -56,5 +55,8 @@ if grep -qz 'fedora' <<< $(flatpak remotes); then
   done
 fi
 
+# Disable the system variant of the flathub repo
+flatpak remote-modify flathub --disable --system
+
 mkdir -p /etc/ublue
 echo $VER > $VER_FILE