From 30d76bb6c07e61fd0d19e46f5f2d14e1042c01a6 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Sat, 6 Feb 2021 15:42:39 -0600 Subject: [PATCH] Fix fact locations. --- facts/general/package.yml | 4 ---- facts/workstation/package.yml | 17 ++++++++--------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/facts/general/package.yml b/facts/general/package.yml index 39720ef..daf49a4 100644 --- a/facts/general/package.yml +++ b/facts/general/package.yml @@ -6,8 +6,6 @@ set_fact: sshfs: sshfs locate: locate - gnome_tweaks: gnome-tweaks - dconf_editor: dconf-editor when: ansible_pkg_mgr == "apt" @@ -15,6 +13,4 @@ set_fact: sshfs: fusefs-sshfs locate: htop # Placeholder to prevent errors. locate builtin FreeBSD. - gnome_tweaks: gnome-tweaks - dconf_editor: dconf-editor when: ansible_system == "FreeBSD" \ No newline at end of file diff --git a/facts/workstation/package.yml b/facts/workstation/package.yml index 2347e66..86c86dd 100644 --- a/facts/workstation/package.yml +++ b/facts/workstation/package.yml @@ -2,31 +2,30 @@ # Define program names per OS for package builtin. # This is only for Workstation devices with UIs. +- name: Facts | Workstation | Package | Consistent + set_fact: + firefox: firefox + thunderbird: thunderbird + evolution: evolution + gnome_tweaks: gnome-tweaks + dconf_editor: dconf-editor + - name: Facts | Workstation | Package | Pop_OS! and Ubuntu set_fact: flatpak_distro: true - firefox: firefox firefox_esr: firefox - thunderbird: thunderbird - evolution: evolution when: ansible_distribution in ("Pop!_OS", "Ubuntu") - name: Facts | Workstation | Package | Debian set_fact: flatpak_distro: true - firefox: firefox firefox_esr: firefox-esr - thunderbird: thunderbird - evolution: evolution when: ansible_distribution in ("Debian") - name: Facts | Workstation | Package | FreeBSD set_fact: flatpak_distro: false - firefox: firefox firefox_esr: firefox-esr - thunderbird: thunderbird - evolution: evolution when: ansible_system == "FreeBSD" \ No newline at end of file