From 28ef91a8f786084627e8b03355ba6239237e874e Mon Sep 17 00:00:00 2001
From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com>
Date: Tue, 11 Jul 2023 06:18:04 +0000
Subject: [PATCH] Latest

---
 .../universal/run_onchange_after_94-bash-it.sh.tmpl        | 7 ++++---
 home/dot_local/bin/executable_install-program              | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

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 8f23b56c..b8b4bdf8 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
@@ -17,9 +17,10 @@ fi
 
 ### Bash-it completions / plugins
 if command -v powerline > /dev/null && [ -f "$HOME/.bashrc" ]; then
-    logg info 'Running `source ~/.bashrc`'
-    source ~/.bashrc
-    logg success 'Imported the `~/.bashrc` profile'
+    # These three lines are probably not needed:
+    # logg info 'Running `source ~/.bashrc`'
+    # source ~/.bashrc
+    # logg success 'Imported the `~/.bashrc` profile'
     if command -v bash-it > /dev/null; then
         if [ -n "$BASH_IT" ]; then
             cd "$BASH_IT" || logg warn "The $BASH_IT directory does not exist"
diff --git a/home/dot_local/bin/executable_install-program b/home/dot_local/bin/executable_install-program
index 5790990c..38aa47b5 100644
--- a/home/dot_local/bin/executable_install-program
+++ b/home/dot_local/bin/executable_install-program
@@ -760,13 +760,13 @@ async function beforeInstall(packageManager) {
     if (!brewUpdated) {
       brewUpdated = true
       try {
-        runCommand('Running brew update / upgrade', `brew update && brew upgrade --force`)
+        runCommand('Running brew update / upgrade', `brew update && brew upgrade --cask --greedy && brew upgrade --force`)
       } catch (e) {
         console.log(e)
         log('error', 'Homebrew', 'Failed running brew update / upgrade')
         log('info', 'Homebrew', 'Running brew tap --repair and trying again')
         try {
-          runCommand('Repairing taps and retrying brew update / upgrade', 'brew tap --repair && brew update && brew upgrade')
+          runCommand('Repairing taps and retrying brew update / upgrade', 'brew tap --repair && brew update && brew upgrade --cask && brew upgrade')
         } catch (e) {
           console.log(e)
           log('error', 'Homebrew', 'Failed both attempts to run brew update / upgrade')