mirror/bazzite
1
0
Fork 0
mirror of https://github.com/ublue-os/bazzite.git synced 2025-02-06 18:41:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Correct possible issue when rebasing from another Fedora issue with flathub/flatpak repositories.

Browse Source 
chore: Use flathub file in image by directly pointing to /usr/etc instead of /etc/.
This commit is contained in:
Kyle Gospodnetich 2024-01-29 21:36:18 -08:00
parent e31e63bcb2
commit 448a3cafa8
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
system_files/desktop/shared/usr/bin/bazzite-flatpak-manager
View File

@ -1,7 +1,7 @@
#!/usr/bin/bash #!/usr/bin/bash
# SCRIPT VERSION # SCRIPT VERSION
VER=18 VER=19
VER_FILE="/etc/bazzite/flatpak_manager_version" VER_FILE="/etc/bazzite/flatpak_manager_version"
VER_RAN=$(cat $VER_FILE) VER_RAN=$(cat $VER_FILE)
IMAGE_INFO="/usr/share/ublue-os/image-info.json" IMAGE_INFO="/usr/share/ublue-os/image-info.json"
@ -30,6 +30,7 @@ if grep -qz 'fedora' <<< $(flatpak remotes); then
fi fi
# Ensure Flathub is enabled # 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 flatpak remote-modify --system --enable flathub
# Installed flatpaks # Installed flatpaks

2
system_files/desktop/shared/usr/bin/bazzite-user-setup
View File

@ -39,7 +39,7 @@ fi
if grep -qz 'fedora' <<< $(flatpak remotes); then if grep -qz 'fedora' <<< $(flatpak remotes); then
flatpak remote-delete --user fedora --force flatpak remote-delete --user fedora --force
fi 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 flatpak remote-modify --user --enable flathub
# Handle privileged tasks # Handle privileged tasks