From 072fb98dd08ba505aeba94642c512ed18ad60a5a Mon Sep 17 00:00:00 2001
From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com>
Date: Sun, 5 Nov 2023 05:33:23 +0000
Subject: [PATCH] Fixes dependency issue and missing folder issue

---
 .../run_onchange_after_81-kubesphere.yml.tmpl          |  6 ++++++
 .../run_onchange_after_85-remove-shortcuts.sh.tmpl     |  4 ++--
 .../universal/run_onchange_after_94-bash-it.sh.tmpl    |  6 +++++-
 home/.chezmoitemplates/darwin/Brewfile                 |  3 +++
 software.yml                                           | 10 ++--------
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/home/.chezmoiscripts/universal/run_onchange_after_81-kubesphere.yml.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_81-kubesphere.yml.tmpl
index 8e580604..7695a4fb 100644
--- a/home/.chezmoiscripts/universal/run_onchange_after_81-kubesphere.yml.tmpl
+++ b/home/.chezmoiscripts/universal/run_onchange_after_81-kubesphere.yml.tmpl
@@ -1,5 +1,11 @@
 {{- if (ne .host.distro.family "windows") -}}
 #!/usr/bin/env bash
+# @file KubeSphere Installation / Configuration
+# @brief Sets up KubeSphere
+# @description
+#     This script sets up [KubeSphere](https://kubesphere.io/). KubeSphere is a distributed operating system for
+#     cloud-native application management, using Kubernetes as its kernel. It provides a plug-and-play architecture,
+#     allowing third-party applications to be seamlessly integrated into its ecosystem.
 
 {{ includeTemplate "universal/profile" }}
 {{ includeTemplate "universal/logg" }}
diff --git a/home/.chezmoiscripts/universal/run_onchange_after_85-remove-shortcuts.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_85-remove-shortcuts.sh.tmpl
index 87821815..fd00c67d 100644
--- a/home/.chezmoiscripts/universal/run_onchange_after_85-remove-shortcuts.sh.tmpl
+++ b/home/.chezmoiscripts/universal/run_onchange_after_85-remove-shortcuts.sh.tmpl
@@ -1,4 +1,4 @@
-{{- if eq .host.distro.family "linux" -}}
+{{- if (eq .host.distro.family "linux") -}}
 #!/usr/bin/env bash
 # @file Linux Shortcut Removal
 # @brief Cleans up desktop shortcuts that are out of place or unwanted on Linux devices
@@ -28,4 +28,4 @@ for DESKTOP_ICON in {{ $removeShortcuts }}; do
     done
 done
 
-{{- end -}}
+{{ end -}}
diff --git a/home/.chezmoiscripts/universal/run_onchange_after_94-bash-it.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_94-bash-it.sh.tmpl
index 4d31248a..119f5147 100644
--- a/home/.chezmoiscripts/universal/run_onchange_after_94-bash-it.sh.tmpl
+++ b/home/.chezmoiscripts/universal/run_onchange_after_94-bash-it.sh.tmpl
@@ -45,7 +45,11 @@ if command -v powerline > /dev/null && [ -f "$HOME/.bashrc" ]; then
         fi
 
         ### Ensure completions are enabled
-        cd "$BASH_IT/enabled"
+        if [ -d "$BASH_IT/enabled" ]; then
+            logg info "Changing directory to $BASH_IT/enabled" && cd "$BASH_IT/enabled"
+        else
+            logg info "$BASH_IT/enabled not a directory yet"
+        fi
         logg info 'Enabling bash-it completions'
         # TODO: Move these plugins to the .chezmoidata.yaml
         for COMPLETION in defaults dirs docker docker-compose export git makefile ng ssh system vagrant; do
diff --git a/home/.chezmoitemplates/darwin/Brewfile b/home/.chezmoitemplates/darwin/Brewfile
index ee562e1b..69b5691d 100644
--- a/home/.chezmoitemplates/darwin/Brewfile
+++ b/home/.chezmoitemplates/darwin/Brewfile
@@ -12,6 +12,9 @@ if OS.mac?
   brew "m-cli"
 end
 brew "age"
+# Ensure macOS Bash gets upgraded to 5+
+brew "bash"
+brew "gawk"
 brew "glow"
 brew "gnupg"
 brew "go"
diff --git a/software.yml b/software.yml
index 23b4592f..90b2598d 100644
--- a/software.yml
+++ b/software.yml
@@ -3598,7 +3598,7 @@ softwarePackages:
     _github: https://github.com/antonmedv/fx
     _home: https://github.com/antonmedv/fx
     _name: FX
-    brew: fxbrew install metrue/fx/fx
+    brew: metrue/fx/fx
     go: github.com/antonmedv/fx@latest
     pacman: fx
     pkg: fx
@@ -6163,13 +6163,7 @@ softwarePackages:
     _bin: vdirsyncer
     _github: https://github.com/pimutils/vdirsyncer
     _name: vdirsyncer
-    _pre: |
-      echo "TODO - Implement the following command after automating the process of setting up contact groups / calendars to sync"
-      echo "vdirsyncer discover contacts"
-      echo "vdirsyncer sync contacts"
-      echo "TODO - Add to cron"
-      echo "*/30 * * * * /usr/local/bin/vdirsyncer sync > /dev/null"
-      echo "This should be in _post instead of _pre - it is here for testing purposes"
+    _pre: echo "TODO - Implement the following command after automating the process of setting up contact groups / calendars to sync" && echo "vdirsyncer discover contacts" && echo "vdirsyncer sync contacts" && echo "TODO - Add to cron" && echo "*/30 * * * * /usr/local/bin/vdirsyncer sync > /dev/null" && echo "This should be in _post instead of _pre - it is here for testing purposes"
     pipx: vdirsyncer
   charm:
     _bin: charm