Merge branch 'master' into stable

* master:
  Bump version
  Switch RetroArch to flatpak for Ubuntu 25.04 compatibility
  Give people a chance to retry a failing installation

bin/omakub-sub/install.sh

@@ -10,7 +10,7 @@ CHOICES=(
   "Mainline Kernels  Install newer Linux kernels than Ubuntu defaults"
   "OBS Studio        Record screencasts with inputs from both display + webcam"
   "Ollama            Run LLMs, like Meta's Llama3, locally"
-  "Retroarch         Play retro games [Incompatible w/ 25.04]"
+  "Retroarch         Play retro games"
   "Spotify           Stream music from the world's most popular service"
   "Steam             Play games from Valve's store"
   "VirtualBox        Virtual machines to run Windows/Linux"

install.sh

@@ -1,6 +1,9 @@
 # Exit immediately if a command exits with a non-zero status
 set -e
 
+# Give people a chance to retry running the installation
+trap 'echo "Omakub installation failed! You can retry by running: source ~/.local/share/omakub/install.sh"' ERR
+
 # Check the distribution name and version and abort if incompatible
 source ~/.local/share/omakub/install/check-version.sh
 

install/desktop/optional/app-retroarch.sh

@@ -1,14 +1 @@
-sudo add-apt-repository -y ppa:libretro/stable
-sudo apt update -y
-sudo apt install -y retroarch retroarch-assets
-
-cat <<EOF >~/.local/share/applications/Retroarch.desktop
-[Desktop Entry]
-Name=RetroArch
-Exec=/usr/bin/retroarch
-Type=Application
-Icon=/home/$USER/.local/share/omakub/applications/icons/Retroarch.png
-Comment=Play retro games
-Categories=Game;Emulator;
-Terminal=false
-EOF
+flatpak install -y flathub org.libretro.RetroArch

uninstall/app-retroarch.sh

@@ -1,5 +1 @@
-sudo add-apt-repository -y --remove ppa:libretro/stable
-sudo apt update -y
-sudo apt remove -y retroarch retroarch-assets
-sudo apt autoremove -y
-rm ~/.local/share/applications/Retroarch.desktop
+flatpak uninstall -y flathub org.libretro.RetroArch

version

@@ -1 +1 @@
-1.2.1
+1.2.2