From 2baedb668c76508a1ab0d45c7be0d03e33d6f4bc Mon Sep 17 00:00:00 2001
From: Matthew Stobbs <matthew@stobbs.ca>
Date: Tue, 18 Mar 2025 19:18:45 -0600
Subject: [PATCH] fix bitwarden macos cask

---
 tasks/config/bitwarden.yml | 3 +++
 tasks/pkgs/bitwarden.yml   | 4 ++--
 vars/pkgs/bitwarden.yml    | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/tasks/config/bitwarden.yml b/tasks/config/bitwarden.yml
index a1f82c2..ed18a9a 100644
--- a/tasks/config/bitwarden.yml
+++ b/tasks/config/bitwarden.yml
@@ -6,6 +6,9 @@
       method: "{{ pkgconfig.bitwarden.method[ansible_distribution] | default('flatpak') }}"
 
 - name: Set bitwarden config
+  when:
+    - bitwarden.method == 'sys' or
+      bitwarden.method == 'cask'
   ansible.builtin.set_fact:
     bitwarden:
       pkg: "{{ pkgconfig.bitwarden[bitwarden.method] }}"
diff --git a/tasks/pkgs/bitwarden.yml b/tasks/pkgs/bitwarden.yml
index d96a69b..5cebebd 100644
--- a/tasks/pkgs/bitwarden.yml
+++ b/tasks/pkgs/bitwarden.yml
@@ -25,9 +25,9 @@
 
     - name: Append bitwarden to pkg_cask
       when:
-        - bitwarden.method == 'brew'
+        - bitwarden.method == 'cask'
       ansible.builtin.set_fact:
-        pkg_cask: "{{ pkg_cask + [bitwarden] }}"
+        pkg_cask: "{{ pkg_cask + [bitwarden.pkg] }}"
 
     - name: Set bitwarden_configured
       ansible.builtin.set_fact:
diff --git a/vars/pkgs/bitwarden.yml b/vars/pkgs/bitwarden.yml
index 2533419..22214d8 100644
--- a/vars/pkgs/bitwarden.yml
+++ b/vars/pkgs/bitwarden.yml
@@ -7,9 +7,9 @@ bitwarden:
     name: bitwarden.appimage
     url: https://vault.bitwarden.com/download/?app=desktop&platform=linux&variant=appimage
   snap: bitwarden
-  brew: bitwarden
+  cask: bitwarden
   method:
     Fedora: flatpak
     Alpine: flatpak
     Ubuntu: snap
-    MacOSX: brew
+    MacOSX: cask