fix: Move fedora repo removal to system flatpak manager

ublue-os · Oct 1, 2023 · dcc6b0c · dcc6b0c
1 parent 49aca95
commit dcc6b0c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/usr/bin/ublue-system-flatpak-manager b/usr/bin/ublue-system-flatpak-manager
@@ -20,6 +20,11 @@ fi
 
 notify-send "Flatpak installer" "Currently installing system flatpaks" --app-name="Flatpak installer" -u NORMAL
 
+# Remove fedora flatpak repo
+if grep -qz 'fedora' <<< $(flatpak remotes); then
+  flatpak remote-delete --user fedora --force
+fi
+
 # Lists of flatpaks
 FLATPAK_LIST=$(flatpak list --columns=application)
 INSTALL_LIST=$(cat /etc/flatpak/system/install)

diff --git a/usr/bin/ublue-user-flatpak-manager b/usr/bin/ublue-user-flatpak-manager
@@ -12,9 +12,6 @@ if [[ -f $VER_FILE && $VER = $VER_RAN ]]; then
 fi
 
 # Setup Flathub
-if grep -qz 'fedora' <<< $(flatpak remotes); then
-  flatpak remote-delete --user fedora --force
-fi
 flatpak remote-add --if-not-exists --user flathub /etc/flatpak/remotes.d/flathub.flatpakrepo
 
 # Lists of flatpaks