From 8e46cb16a5617ba9853f7d1ccc3f7a90fcf1c029 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Wed, 5 Aug 2026 16:21:41 -0700 Subject: [PATCH] arch, change checks for Archlinux to looking for pacman in case forks decide to use their own name in the future. --- facts/general/service.yml | 2 +- tasks/general/acct_mgmt/users.yml | 10 +++++----- tasks/general/software/packages.yml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/facts/general/service.yml b/facts/general/service.yml index 91bbdfc..15159a1 100644 --- a/facts/general/service.yml +++ b/facts/general/service.yml @@ -21,7 +21,7 @@ set_fact: crond: cronie crond_pattern: cronie - when: ansible_distribution in ("Archlinux") + when: ansible_pkg_mgr == "pacman" - name: General | Facts | Service | Fedora set_fact: diff --git a/tasks/general/acct_mgmt/users.yml b/tasks/general/acct_mgmt/users.yml index 80e7451..934f529 100644 --- a/tasks/general/acct_mgmt/users.yml +++ b/tasks/general/acct_mgmt/users.yml @@ -16,12 +16,12 @@ backup: yes create: no state: present - when: ansible_distribution == "Archlinux" + when: ansible_pkg_mgr == "pacman" #- name: General | Account Management | Users | Use ZSH (Arch+Manjaro) # set_fact: # user_shell: "{{ zsh_exec.stdout }}" -# when: ansible_distribution == "Archlinux" +# when: ansible_pkg_mgr == "pacman" # #- name: General | Account Management | Users | Allow ZSH (Arch) # lineinfile: @@ -32,7 +32,7 @@ # backup: yes # create: no # state: present -# when: ansible_distribution == "Archlinux" +# when: ansible_pkg_mgr == "pacman" ## Root ## @@ -130,8 +130,8 @@ export_terminal: export TERMINAL="kitty" export_browser: | function find-firefox { - which firefox 2>/dev/null || - which firefox-esr 2>/dev/null || + which firefox 2>/dev/null || + which firefox-esr 2>/dev/null || which firefox-flatpak 2>/dev/null } export BROWSER="`find-firefox`" diff --git a/tasks/general/software/packages.yml b/tasks/general/software/packages.yml index 182bd4f..b5efc64 100644 --- a/tasks/general/software/packages.yml +++ b/tasks/general/software/packages.yml @@ -108,7 +108,7 @@ - which - "{{ cron }}" state: present - when: ansible_distribution == "Archlinux" + when: ansible_pkg_mgr == "pacman" - name: General | Software | Packages | Install Fix (Looking at you, openSUSE) package: