fix broken flatpak

This commit is contained in:
Matthew Stobbs
2025-02-25 09:48:07 -07:00
parent a4398fa72e
commit 4ae443fe26
7 changed files with 40 additions and 16 deletions

View File

@@ -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:

10
tasks/config/httpie.yml Normal file
View File

@@ -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] }}"

View File

@@ -23,6 +23,14 @@
when:
- pkg_flatpak|length > 0
become: "{{ ext_become }}"
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

View File

@@ -19,4 +19,4 @@
when:
- bitwarden.method == 'brew'
ansible.builtin.set_fact:
pkg_cask: "{{ pkg_cask + [bitwarden.pkg.name] }}"
pkg_cask: "{{ pkg_cask + [bitwarden] }}"

View File

@@ -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] }}"

View File

@@ -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

8
vars/pkgs/httpie.yml Normal file
View File

@@ -0,0 +1,8 @@
httpie:
flatpak:
name: io.httpie.Httpie
remote: flathub
brew: httpie
method:
default: flatpak
MacOSX: brew