From 9398351d7ec6498e9f1c4a17a7bdfcb0f063c09e Mon Sep 17 00:00:00 2001
From: Hyperling <me@hyperling.com>
Date: Sat, 6 Feb 2021 11:27:20 -0600
Subject: [PATCH] Pop!_OS and Ubuntu do not have ESR in repos.

---
 facts/workstation/package.yml     | 24 ++++++++++++------------
 tasks/linux/software/flatpaks.yml | 13 ++++++++++---
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/facts/workstation/package.yml b/facts/workstation/package.yml
index ca0d7cd..2347e66 100644
--- a/facts/workstation/package.yml
+++ b/facts/workstation/package.yml
@@ -2,24 +2,24 @@
 # Define program names per OS for package builtin.
 # This is only for Workstation devices with UIs.
 
-- name: Facts | Workstation | Package | Pop OS
+- 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 == "Pop!_OS"
-
-
-- name: Facts | Workstation | Package | Debian and Ubuntu
-  set_fact:
-    flatpak_distro: true
-    firefox: firefox
-    firefox_esr: firefox-esr
-    thunderbird: thunderbird
-    evolution: evolution
-  when: ansible_distribution in ("Debian","Ubuntu")
+  when: ansible_distribution in ("Debian")
 
 
 - name: Facts | Workstation | Package | FreeBSD
diff --git a/tasks/linux/software/flatpaks.yml b/tasks/linux/software/flatpaks.yml
index e240b97..6ddc72d 100644
--- a/tasks/linux/software/flatpaks.yml
+++ b/tasks/linux/software/flatpaks.yml
@@ -22,7 +22,7 @@
   flatpak:
     name: org.shotcut.Shotcut
 
-- name: Workstation | Linux | Flatpak | Do Not Use Firefox Flatpak
+- name: Workstation | Linux | Flatpak | Do Not Use Firefox Flatpak (It's Broke Boys!)
   flatpak:
     name: org.mozilla.firefox
     state: absent
@@ -32,11 +32,18 @@
     name: org.mozilla.Thunderbird
 
 # Repo Software
-- name: Workstation | Linux | Flatpak | Install Firefox From Package Manager
+- name: Workstation | Linux | Flatpak | Install Firefox ESR From Package Manager
   package: 
     name:
     - "{{ firefox_esr }}"
-    state: present
+    state: latest
+
+- name: Workstation | Linux | Flatpak | Remove Normal Firefox for ESR
+  package: 
+    name:
+    - "{{ firefox }}"
+    state: absent
+  when: "{{ firefox }} != {{ firefix_esr }}"
 
 - name: Workstation | Linux | Flatpak | Remove Software From Package Manager
   package: