fix: Correct possible issue when rebasing from another Fedora issue w…

…ith flathub/flatpak repositories. chore: Use flathub file in image by directly pointing to /usr/etc instead of /etc/.
ublue-os · Jan 30, 2024 · 448a3ca · 448a3ca
1 parent e31e63b
commit 448a3ca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/system_files/desktop/shared/usr/bin/bazzite-flatpak-manager b/system_files/desktop/shared/usr/bin/bazzite-flatpak-manager
@@ -1,7 +1,7 @@
 #!/usr/bin/bash
 
 # SCRIPT VERSION
-VER=18
+VER=19
 VER_FILE="/etc/bazzite/flatpak_manager_version"
 VER_RAN=$(cat $VER_FILE)
 IMAGE_INFO="/usr/share/ublue-os/image-info.json"
@@ -30,6 +30,7 @@ if grep -qz 'fedora' <<< $(flatpak remotes); then
 fi
 
 # Ensure Flathub is enabled
+flatpak remote-add --if-not-exists --system flathub /usr/etc/flatpak/remotes.d/flathub.flatpakrepo
 flatpak remote-modify --system --enable flathub
 
 # Installed flatpaks

diff --git a/system_files/desktop/shared/usr/bin/bazzite-user-setup b/system_files/desktop/shared/usr/bin/bazzite-user-setup
@@ -39,7 +39,7 @@ fi
 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
+flatpak remote-add --if-not-exists --user flathub /usr/etc/flatpak/remotes.d/flathub.flatpakrepo
 flatpak remote-modify --user --enable flathub
 
 # Handle privileged tasks