From 217ee95d2a79ddce50178e47b41276a654a18eaf Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Sat, 19 Apr 2025 17:04:35 +0200
Subject: [PATCH 1/3] Give people a chance to retry a failing installation

---
 install.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/install.sh b/install.sh
index 6d51d7b..d49e3f3 100644
--- a/install.sh
+++ b/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
 

From 7df8677071f434d1c7d2cd7ab3abe6b26b3941c2 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Sat, 19 Apr 2025 18:29:13 +0200
Subject: [PATCH 2/3] Switch RetroArch to flatpak for Ubuntu 25.04
 compatibility

Closes #438
---
 bin/omakub-sub/install.sh                 |  2 +-
 install/desktop/optional/app-retroarch.sh | 15 +--------------
 uninstall/app-retroarch.sh                |  6 +-----
 3 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/bin/omakub-sub/install.sh b/bin/omakub-sub/install.sh
index 15ef5ff..f5958a9 100644
--- a/bin/omakub-sub/install.sh
+++ b/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"
diff --git a/install/desktop/optional/app-retroarch.sh b/install/desktop/optional/app-retroarch.sh
index abe7743..ae6853b 100644
--- a/install/desktop/optional/app-retroarch.sh
+++ b/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
diff --git a/uninstall/app-retroarch.sh b/uninstall/app-retroarch.sh
index c94e40c..956f46e 100644
--- a/uninstall/app-retroarch.sh
+++ b/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

From 65e0259857f2ed00de3e347d259ebebdb582a772 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Sat, 19 Apr 2025 18:34:14 +0200
Subject: [PATCH 3/3] Bump version

---
 version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version b/version
index 6085e94..23aa839 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.2.1
+1.2.2