From c49e0bd76cc4e48d8607db69ef9d23b80b070b44 Mon Sep 17 00:00:00 2001
From: Gerald Pinder <4626052+gmpinder@users.noreply.github.com>
Date: Sun, 11 Feb 2024 23:16:38 -0500
Subject: [PATCH] Create r2modman module

---
 config/r2modman.yml                | 7 +++++++
 config/recipe-jp-desktop.yml       | 4 +---
 config/scripts/install-r2modman.sh | 3 +--
 3 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 config/r2modman.yml

diff --git a/config/r2modman.yml b/config/r2modman.yml
new file mode 100644
index 0000000..a88f896
--- /dev/null
+++ b/config/r2modman.yml
@@ -0,0 +1,7 @@
+modules:
+  - type: rpm-ostree
+    optfix:
+      - r2modman
+  - type: script
+    scripts:
+      - install-r2modman.sh
diff --git a/config/recipe-jp-desktop.yml b/config/recipe-jp-desktop.yml
index 326e328..53839c6 100644
--- a/config/recipe-jp-desktop.yml
+++ b/config/recipe-jp-desktop.yml
@@ -4,6 +4,7 @@ image-version: latest
 description: The image of Wunker OS for JP's desktop.
 blue-build-tag: main-installer
 modules:
+  - from-file: r2modman.yml
   - type: files
     files:
       - 8bitdo-ultimate: /usr
@@ -15,6 +16,3 @@ modules:
       - COPY --from=registry.gitlab.com/wunker-bunker/xboxdrv-docker /usr/local/bin/xboxdrvctl /usr/bin/xboxdrvctl
       - COPY --from=registry.gitlab.com/wunker-bunker/xboxdrv-docker /usr/local/share/man/man1/xboxdrv.1 /usr/share/man/man1/xboxdrv.1
   - from-file: jp-apps.yml
-  - type: script
-    scripts:
-      - install-r2modman.sh
diff --git a/config/scripts/install-r2modman.sh b/config/scripts/install-r2modman.sh
index f7bd7af..e4bc0d8 100755
--- a/config/scripts/install-r2modman.sh
+++ b/config/scripts/install-r2modman.sh
@@ -1,10 +1,9 @@
 #!/usr/bin/env bash
 
-set -xeuo pipefail
+set -euo pipefail
 
 VERSION="3.1.46"
 
 curl -L https://github.com/ebkr/r2modmanPlus/releases/download/v${VERSION}/r2modman-${VERSION}.x86_64.rpm -o r2modman-${VERSION}.x86_64.rpm
 
 rpm-ostree install r2modman-${VERSION}.x86_64.rpm
-rm -f r2modman-${VERSION}.x86_64.rpm