From 0b5e7599f89c5bdeb08201066d26e06517208b85 Mon Sep 17 00:00:00 2001
From: Gerald Pinder <gmpinder@gmail.com>
Date: Sun, 28 Apr 2024 18:14:43 -0400
Subject: [PATCH] fix: Fix flatpak module errors

---
 .../test-repo/recipes/flatpaks.yml            | 37 +++++++++++++++++++
 .../test-repo/recipes/recipe.yml              | 11 +-----
 scripts/run_module.sh                         |  6 +--
 3 files changed, 41 insertions(+), 13 deletions(-)
 create mode 100644 integration-tests/test-repo/recipes/flatpaks.yml

diff --git a/integration-tests/test-repo/recipes/flatpaks.yml b/integration-tests/test-repo/recipes/flatpaks.yml
new file mode 100644
index 0000000..e32cc8b
--- /dev/null
+++ b/integration-tests/test-repo/recipes/flatpaks.yml
@@ -0,0 +1,37 @@
+type: default-flatpaks
+notify: true
+system:
+  repo-url: https://dl.flathub.org/repo/flathub.flatpakrepo
+  repo-name: flathub-system
+  repo-title: "Flathub (System)" # Optional; this sets the remote's user-facing name in graphical frontends like GNOME Software
+  install:
+    - org.gnome.Boxes
+    - org.gnome.Calculator
+    - org.gnome.Calendar
+    - org.gnome.Snapshot
+    - org.gnome.Contacts
+    - org.gnome.clocks
+    - com.belmoussaoui.Decoder
+    - org.gnome.Evince
+    - org.gnome.Maps
+    - org.gnome.TextEditor
+    - com.github.neithern.g4music
+    - com.github.rafostar.Clapper
+    - org.gnome.Loupe
+    - io.gitlab.librewolf-community
+    - io.missioncenter.MissionCenter
+    - org.gnome.World.Secrets
+    - com.belmoussaoui.Authenticator
+    - com.vixalien.sticky
+    - com.github.flxzt.rnote
+    - org.localsend.localsend_app
+    - com.dec05eba.gpu_screen_recorder
+    - com.github.tchx84.Flatseal
+    - io.github.flattool.Warehouse
+    - io.github.fabrialberio.pinapp
+    - com.mattjakeman.ExtensionManager
+    - com.github.wwmm.easyeffects
+user:
+  repo-url: https://dl.flathub.org/repo/flathub.flatpakrepo
+  repo-name: flathub-user
+  repo-title: "Flathub"
diff --git a/integration-tests/test-repo/recipes/recipe.yml b/integration-tests/test-repo/recipes/recipe.yml
index a98bb5d..e3a5485 100644
--- a/integration-tests/test-repo/recipes/recipe.yml
+++ b/integration-tests/test-repo/recipes/recipe.yml
@@ -4,6 +4,7 @@ base-image: ghcr.io/ublue-os/silverblue-main
 image-version: 39
 modules:
   - from-file: akmods.yml
+  - from-file: flatpaks.yml
 
   - type: files
     files:
@@ -23,16 +24,6 @@ modules:
       - firefox
       - firefox-langpacks
 
-  - type: default-flatpaks
-    notify: true
-    system:
-      install:
-        - org.mozilla.firefox
-        - org.gnome.Loupe
-        - one.ablaze.floorp//lightning
-      remove:
-        - org.gnome.eog
-
   - type: signing
 
   - type: test-module
diff --git a/scripts/run_module.sh b/scripts/run_module.sh
index 88f089f..85a4661 100644
--- a/scripts/run_module.sh
+++ b/scripts/run_module.sh
@@ -21,12 +21,12 @@ title_case() {
   echo $(tr '[:lower:]' '[:upper:]' <<< ${1:0:1})${1:1}
 }
 
-module=$1
-params=$2
+module="$1"
+params="$2"
 script_path="/tmp/modules/${module}/${module}.sh"
 
 print_banner "Start $(title_case ${module}) Module"
 chmod +x ${script_path}
-${script_path} ${params}
+${script_path} "${params}"
 print_banner "End $(title_case ${module}) Module"
 ostree container commit