From e50094f4966d150f2fb0567e48ee25225aa710e1 Mon Sep 17 00:00:00 2001
From: Ethan Hu <114451816+oski-bear@users.noreply.github.com>
Date: Tue, 12 Sep 2023 21:34:24 -0700
Subject: [PATCH 1/4] "maybe you should PR getting foot-terminfo installed on
 all ocf machines"

---
 modules/ocf/manifests/packages.pp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/ocf/manifests/packages.pp b/modules/ocf/manifests/packages.pp
index a6622d782..041d6809e 100644
--- a/modules/ocf/manifests/packages.pp
+++ b/modules/ocf/manifests/packages.pp
@@ -141,6 +141,13 @@
     }
   }
 
+  # TODO: remove this once we replace vampires
+  if $::os[distro][codename] >= 11 {
+    package {
+      'foot-terminfo':;
+    }
+  }
+
   ocf::repackage { 'python3-attr':
     backport_on =>  ['stretch'],
   }

From 1a5fb66fa9a085f758c7102add3928ae2e492209 Mon Sep 17 00:00:00 2001
From: Ethan Hu <114451816+oski-bear@users.noreply.github.com>
Date: Mon, 18 Sep 2023 13:08:43 -0700
Subject: [PATCH 2/4] Update packages.pp

---
 modules/ocf/manifests/packages.pp | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/modules/ocf/manifests/packages.pp b/modules/ocf/manifests/packages.pp
index 041d6809e..2337e2696 100644
--- a/modules/ocf/manifests/packages.pp
+++ b/modules/ocf/manifests/packages.pp
@@ -133,17 +133,11 @@
     ]:;
   }
 
-  # TODO: remove this once we no longer support stretch (and move to above
-  # packages block)
+  # TODO: remove this once we replace vampires and no longer support stretch (and move to above
+  # packages block) 
   if $::os[distro][codename] != 'stretch' {
     package {
       'kitty-terminfo':;
-    }
-  }
-
-  # TODO: remove this once we replace vampires
-  if $::os[distro][codename] >= 11 {
-    package {
       'foot-terminfo':;
     }
   }

From 32fc503cc106eeca9ee4ed70fb733c51be550dbb Mon Sep 17 00:00:00 2001
From: Ethan Hu <114451816+oski-bear@users.noreply.github.com>
Date: Mon, 18 Sep 2023 13:13:16 -0700
Subject: [PATCH 3/4] Fix syntax

---
 modules/ocf/manifests/packages.pp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/ocf/manifests/packages.pp b/modules/ocf/manifests/packages.pp
index 2337e2696..e3f9141e9 100644
--- a/modules/ocf/manifests/packages.pp
+++ b/modules/ocf/manifests/packages.pp
@@ -137,8 +137,10 @@
   # packages block) 
   if $::os[distro][codename] != 'stretch' {
     package {
-      'kitty-terminfo':;
-      'foot-terminfo':;
+      [
+        'kitty-terminfo',
+        'foot-terminfo',
+      ]:;
     }
   }
 

From a9a594659d2a87de334ef2e9a91f83d4e42a6cb1 Mon Sep 17 00:00:00 2001
From: Ethan Hu <114451816+oski-bear@users.noreply.github.com>
Date: Mon, 18 Sep 2023 13:16:52 -0700
Subject: [PATCH 4/4] Remove space

---
 modules/ocf/manifests/packages.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ocf/manifests/packages.pp b/modules/ocf/manifests/packages.pp
index e3f9141e9..e0575049f 100644
--- a/modules/ocf/manifests/packages.pp
+++ b/modules/ocf/manifests/packages.pp
@@ -134,7 +134,7 @@
   }
 
   # TODO: remove this once we replace vampires and no longer support stretch (and move to above
-  # packages block) 
+  # packages block)
   if $::os[distro][codename] != 'stretch' {
     package {
       [