From 4ae443fe26c30dbb67ebc4ec37c82651abd7480e Mon Sep 17 00:00:00 2001
From: Matthew Stobbs <matthew.stobbs@ucalgary.ca>
Date: Tue, 25 Feb 2025 09:48:07 -0700
Subject: [PATCH] fix broken flatpak

---
 tasks/config/bitwarden.yml |  2 +-
 tasks/config/httpie.yml    | 10 ++++++++++
 tasks/linux.yml            | 24 ++++++++++++++++--------
 tasks/pkgs/bitwarden.yml   |  2 +-
 tasks/pkgs/httpie.yml      |  4 ++--
 vars/pkgs/bitwarden.yml    |  6 ++----
 vars/pkgs/httpie.yml       |  8 ++++++++
 7 files changed, 40 insertions(+), 16 deletions(-)
 create mode 100644 tasks/config/httpie.yml
 create mode 100644 vars/pkgs/httpie.yml

diff --git a/tasks/config/bitwarden.yml b/tasks/config/bitwarden.yml
index e348fec..a1f82c2 100644
--- a/tasks/config/bitwarden.yml
+++ b/tasks/config/bitwarden.yml
@@ -3,7 +3,7 @@
 - name: Set bitwarden install method
   ansible.builtin.set_fact:
     bitwarden:
-      method: "{{ pkgconfig.bitwarden.method[ansible_distribution] | default('appimage') }}"
+      method: "{{ pkgconfig.bitwarden.method[ansible_distribution] | default('flatpak') }}"
 
 - name: Set bitwarden config
   ansible.builtin.set_fact:
diff --git a/tasks/config/httpie.yml b/tasks/config/httpie.yml
new file mode 100644
index 0000000..13228b9
--- /dev/null
+++ b/tasks/config/httpie.yml
@@ -0,0 +1,10 @@
+- name: Set method for httpie
+  ansible.builtin.set_fact:
+    httpie:
+      method: "{{ pkgconfig.httpie.method[ansible_distribution] | default(pkgconfig.httpie.method.default) }}"
+
+- name: Set config for httpie
+  ansible.builtin.set_fact:
+    httpie:
+      method: "{{ httpie.method }}"
+      pkg: "{{ pkgconfig.httpie.[httpie.method] }}"
diff --git a/tasks/linux.yml b/tasks/linux.yml
index e4cf042..55143bd 100644
--- a/tasks/linux.yml
+++ b/tasks/linux.yml
@@ -23,14 +23,22 @@
       when:
         - pkg_flatpak|length > 0
       become: "{{ ext_become }}"
-      loop: "{{ pkg_flatpak | unique }}"
-      loop_control:
-        loop_var: flatpak
-      community.general.flatpak:
-        method: "{{ flatpak_method }}"
-        name: "{{ flatpak.name }}"
-        remote: "{{ flatpak.remote | default('flathub') }}"
-        state: present
+      block:
+        - name: Debug flatpak
+          loop: "{{ pkg_flatpak | unique }}"
+          loop_control:
+            loop_var: flatpak
+          ansible.builtin.debug:
+            var: flatpak
+        - name: Install flatpak
+          loop: "{{ pkg_flatpak | unique }}"
+          loop_control:
+            loop_var: flatpak
+          community.general.flatpak:
+            method: "{{ flatpak_method }}"
+            name: "{{ flatpak.name }}"
+            remote: "{{ flatpak.remote | default('flathub') }}"
+            state: present
 
 - name: Install pkg_appimage
   when:
diff --git a/tasks/pkgs/bitwarden.yml b/tasks/pkgs/bitwarden.yml
index c16482e..fb810e5 100644
--- a/tasks/pkgs/bitwarden.yml
+++ b/tasks/pkgs/bitwarden.yml
@@ -19,4 +19,4 @@
   when:
     - bitwarden.method == 'brew'
   ansible.builtin.set_fact:
-    pkg_cask: "{{ pkg_cask + [bitwarden.pkg.name] }}"
+    pkg_cask: "{{ pkg_cask + [bitwarden] }}"
diff --git a/tasks/pkgs/httpie.yml b/tasks/pkgs/httpie.yml
index 3e41402..d457a84 100644
--- a/tasks/pkgs/httpie.yml
+++ b/tasks/pkgs/httpie.yml
@@ -7,10 +7,10 @@
     - Depend flatpak
   changed_when: true
   ansible.builtin.set_fact:
-    pkg_flatpak: "{{ pkg_flatpak + ['io.httpie.Httpie'] }}"
+    pkg_flatpak: "{{ pkg_flatpak + [httpie.pkg] }}"
 
 - name: Append to pkg_cask
   when:
     - ansible_os_family == 'Darwin'
   ansible.builtin.set_fact:
-    pkg_cask: "{{ pkg_cask + ['httpie'] }}"
+    pkg_cask: "{{ pkg_cask + [httpie.pkg] }}"
diff --git a/vars/pkgs/bitwarden.yml b/vars/pkgs/bitwarden.yml
index 0dc8ba5..3b7ff4b 100644
--- a/vars/pkgs/bitwarden.yml
+++ b/vars/pkgs/bitwarden.yml
@@ -6,10 +6,8 @@ bitwarden:
     link_name: bitwarden
     name: bitwarden.appimage
     url: https://vault.bitwarden.com/download/?app=desktop&platform=linux&variant=appimage
-  snap:
-    name: bitwarden
-  brew:
-    name: bitwarden
+  snap: bitwarden
+  brew: bitwarden
   method:
     Fedora: flatpak
     Ubuntu: snap
diff --git a/vars/pkgs/httpie.yml b/vars/pkgs/httpie.yml
new file mode 100644
index 0000000..5478f96
--- /dev/null
+++ b/vars/pkgs/httpie.yml
@@ -0,0 +1,8 @@
+httpie:
+  flatpak:
+    name: io.httpie.Httpie
+    remote: flathub
+  brew: httpie
+  method:
+    default: flatpak
+    MacOSX: brew