From b25f452d8cebbc609b4ca76903626fd8178a0701 Mon Sep 17 00:00:00 2001
From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com>
Date: Mon, 13 May 2024 06:40:05 +0000
Subject: [PATCH] Switched ansible-core to ansible

---
 .../universal/run_after_01-pre-install.sh.tmpl              | 6 +++---
 home/.chezmoiscripts/universal/run_before_05-system.sh.tmpl | 6 +++---
 home/dot_local/bin/executable_install-program               | 6 +++---
 home/dot_local/bin/executable_install-program-edit          | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/home/.chezmoiscripts/universal/run_after_01-pre-install.sh.tmpl b/home/.chezmoiscripts/universal/run_after_01-pre-install.sh.tmpl
index a4a472b7..cee09ad9 100644
--- a/home/.chezmoiscripts/universal/run_after_01-pre-install.sh.tmpl
+++ b/home/.chezmoiscripts/universal/run_after_01-pre-install.sh.tmpl
@@ -933,13 +933,13 @@ symlinkAnsibleRoles() {
         pipx ensurepath
       fi
       logg info 'Installing ansible-core via pipx'
-      pipx install ansible-core
+      pipx install ansible
       if [ -d /Applications ] && [ -d /System ]; then
         logg info 'Injecting macOS-specific pipx dependencies via pipx'
-        pipx inject ansible-core PyObjC PyObjC-core
+        pipx inject ansible PyObjC PyObjC-core
       fi
       logg info 'Injecting Ansible dependencies via pipx'
-      pipx inject ansible-core docker lxml netaddr pexpect python-vagrant pywinrm requests-credssp watchdog
+      pipx inject ansible docker lxml netaddr pexpect python-vagrant pywinrm requests-credssp watchdog
       mkdir -p "${XDG_CACHE_HOME:-$HOME/.cache}/megabyte-labs"
       touch "${XDG_CACHE_HOME:-$HOME/.cache}/megabyte-labs/ansible-installed"
     fi
diff --git a/home/.chezmoiscripts/universal/run_before_05-system.sh.tmpl b/home/.chezmoiscripts/universal/run_before_05-system.sh.tmpl
index 007e3196..87d8fd23 100644
--- a/home/.chezmoiscripts/universal/run_before_05-system.sh.tmpl
+++ b/home/.chezmoiscripts/universal/run_before_05-system.sh.tmpl
@@ -643,11 +643,11 @@ showNotificationCenter() {
 installAnsible() {
   if command -v pipx > /dev/null; then
     if [ ! -f "${XDG_CACHE_HOME:-$HOME/.cache}/install.doctor/ansible-installed" ]; then
-      logg info 'Running pipx install ansible-core' && pipx install ansible-core
+      logg info 'Running pipx install ansible' && pipx install ansible
       if [ -d /Applications ] && [ -d /System ]; then
-        logg info 'Injecting ansible-core pipx with ansible-core PyObjC PyObjC-core because system is macOS' && pipx inject ansible-core PyObjC PyObjC-core
+        logg info 'Injecting ansible pipx with ansible PyObjC PyObjC-core because system is macOS' && pipx inject ansible PyObjC PyObjC-core
       fi
-      logg info 'Running pipx inject ansible-core docker lxml netaddr pexpect python-vagrant pywinrm requests-credssp watchdog' && pipx inject ansible-core docker lxml netaddr pexpect python-vagrant pywinrm requests-credssp watchdog
+      logg info 'Running pipx inject ansible docker lxml netaddr pexpect python-vagrant pywinrm requests-credssp watchdog' && pipx inject ansible docker lxml netaddr pexpect python-vagrant pywinrm requests-credssp watchdog
       mkdir -p "${XDG_CACHE_HOME:-$HOME/.cache}/install.doctor"
       touch "${XDG_CACHE_HOME:-$HOME/.cache}/install.doctor/ansible-installed"
     else
diff --git a/home/dot_local/bin/executable_install-program b/home/dot_local/bin/executable_install-program
index cc6a013f..53fc347a 100644
--- a/home/dot_local/bin/executable_install-program
+++ b/home/dot_local/bin/executable_install-program
@@ -874,11 +874,11 @@ async function ensureInstalled(bin, callback) {
 }
 
 async function ensurePackageManagerAnsible() {
-  await $`pipx install ansible-core`
+  await $`pipx install ansible`
   if (osType === 'darwin') {
-    await $`pipx inject ansible-core PyObjC PyObjC-core`
+    await $`pipx inject ansible PyObjC PyObjC-core`
   }
-  await $`pipx inject ansible-core docker lxml netaddr pexpect python-vagrant pywinrm requests-credssp watchdog`
+  await $`pipx inject ansible docker lxml netaddr pexpect python-vagrant pywinrm requests-credssp watchdog`
   await $`mkdir -p "$HOME/.cache/megabyte-labs"`
   await $`touch "$HOME/.cache/megabyte-labs/ansible-installed"`
   log('info', 'Package Manager Install', `Ansible and its supporting packages are now installed via pipx`)
diff --git a/home/dot_local/bin/executable_install-program-edit b/home/dot_local/bin/executable_install-program-edit
index 94388ab5..7104458b 100644
--- a/home/dot_local/bin/executable_install-program-edit
+++ b/home/dot_local/bin/executable_install-program-edit
@@ -747,11 +747,11 @@ async function ensureInstalled(bin, callback) {
 }*/
 /*
 async function ensurePackageManagerAnsible() {
-  await $`pipx install ansible-core`
+  await $`pipx install ansible`
   if (osType === 'darwin') {
-    await $`pipx inject ansible-core PyObjC PyObjC-core`
+    await $`pipx inject ansible PyObjC PyObjC-core`
   }
-  await $`pipx inject ansible-core docker lxml netaddr pexpect python-vagrant pywinrm requests-credssp watchdog`
+  await $`pipx inject ansible docker lxml netaddr pexpect python-vagrant pywinrm requests-credssp watchdog`
   await $`mkdir -p "$HOME/.cache/megabyte-labs"`
   await $`touch "$HOME/.cache/megabyte-labs/ansible-installed"`
   log('info', 'Package Manager Install', `Ansible and its supporting packages are now installed via pipx`)