bash/deb-update.bash

@@ -58,6 +58,13 @@ if [[ -f /usr/bin/dnf && ! -d /sysroot/ostree ]]; then
 
 	# potentially unsafe, see a few lines above and the apt-get section
 	dnf "$@" autoremove
+elif [[ -f /usr/bin/rpm-ostree && -d /sysroot/ostree ]]; then
+	rpm-ostree upgrade --check
+	sleep 5
+	rpm-ostree upgrade
+	sleep 5
+	rpm-ostree status -v
+	sleep 5
 fi
 
 # Arch Linux package management
@@ -151,13 +158,9 @@ if hash checkservices 2> /dev/null; then
 	sleep 5
 fi
 
-if [[ -f /usr/bin/rpm-ostree && -d /sysroot/ostree ]]; then
+# Sedric workaround, located in this repo. I trust /root/
-	rpm-ostree upgrade --check
+if [ -f /root/fixgrub.bash ]; then
-	sleep 5
+	. /root/fixgrub.bash
-	rpm-ostree upgrade
-	sleep 5
-	rpm-ostree status -v
-	sleep 5
 fi
 
 # Hide commands being executed again

bash/fixgrub.bash

@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+# Theoretically this should never run
+# READ https://fedoraproject.org/wiki/GRUB_2 !!!!!
+
+set -x
+
+# Fedora < 34
+#if [ -f /boot/efi/EFI/fedora/grub.cfg.rpmsave ]; then
+#	rm -f /boot/efi/EFI/fedora/grub.cfg.rpmsave
+#	grub2-mkconfig -o /boot/efi/EFI/fedora/grub.cfg
+#fi
+
+# There is no reason to run if dnf hasn't moved the proper config aside.
+if [ -f /etc/grub2.cfg.rpmsave ]; then
+	rm -f /etc/grub2.cfg.rpmsave
+	grub2-mkconfig -o /etc/grub2.cfg
+fi
+
+# There is no reason to run if dnf hasn't moved the proper config aside.
+if [ -f /etc/grub2-efi.cfg.rpmsave ]; then
+	rm -f /etc/grub2-efi.cfg.rpmsave
+	grub2-mkconfig -o /etc/grub2-efi.cfg
+fi
+
+# There is no reason to run if dnf hasn't moved the proper config aside.
+# Legacy boot method for grub update.
+# if [ -f /boot/grub2/grub.cfg.rpmsave ]; then
+# 	rm -f /boot/grub2/grub.cfg.rpmsave
+# 	grub2-mkconfig -o /boot/grub2/grub.cfg
+# fi
+
+set +x

bash/flatpak-workarounds.bash

@@ -96,15 +96,6 @@ flatpak override com.valvesoftware.Steam --filesystem=~/SteamLibrary:create $@
 flatpak override net.lutris.Lutris --filesystem=~/SteamLibrary:create $@
 flatpak override com.heroicgameslauncher.hgl --filesystem=~/SteamLibrary:create $@
 
-# Steam's Proton-GE (flatpak). Not supported. Via https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/issues/309#issuecomment-2746256940
-# Add /var/lib/flatpak/runtime/com.valvesoftware.Steam.CompatibilityTool.Proton-GE/$(uname -m)/stable/active/files/proton
-# as a custom proton
-# TODO NOT: don't do this, use the integrated Proton-GE-Latest from WINE
-# manager and just don't enable mangohud in GUI (enabled by this script
-# already) and keep gamescope/upscaling off and there will not be hooking
-# failure message.
-#flatpak override com.heroicgameslauncher.hgl --filesystem=/var/lib/flatpak/runtime/com.valvesoftware.Steam.CompatibilityTool.Proton-GE/$(uname -m)/stable $@
-
 # My Steam Deck laziness. My systemd units check for /var/ and Steam checks
 # free space based on top level directory so it has to be a subdirectory
 # and while the mount point may be /var/sdcard I don't want to give it