From b469e9fd718d811755e4a2c27822afa57b6bda07 Mon Sep 17 00:00:00 2001
From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com>
Date: Wed, 14 Jun 2023 01:41:36 +0000
Subject: [PATCH] Latest

---
 .../universal/run_before_02-decrypt-age-key.sh.tmpl    | 10 +++-------
 .../run_onchange_before_11-install-docker.sh.tmpl      |  4 +---
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/home/.chezmoiscripts/universal/run_before_02-decrypt-age-key.sh.tmpl b/home/.chezmoiscripts/universal/run_before_02-decrypt-age-key.sh.tmpl
index d71e50c1..55616379 100644
--- a/home/.chezmoiscripts/universal/run_before_02-decrypt-age-key.sh.tmpl
+++ b/home/.chezmoiscripts/universal/run_before_02-decrypt-age-key.sh.tmpl
@@ -45,21 +45,17 @@ decryptionFailure() {
 
 ### Install Age via Homebrew if not present
 installAge() {
-  if ! command -v brew > /dev/null; then
+  if ! command -v age > /dev/null; then
     logg info 'Running `brew install age`'
     brew install age
-  else
-    logg warn '`age` is not installed which is utilized in the decryption process'
   fi
 }
 
 ### Install Expect via Homebrew if not present
 installExpect() {
-  if ! command -v brew > /dev/null; then
+  if ! command -v expect > /dev/null; then
     logg info 'Running `brew install expect`'
     brew install expect
-  else
-    logg warn '`expect` is not installed which is utilized in the decryption process'
   fi
 }
 
@@ -102,7 +98,7 @@ elif [ -n "$HEADLESS_INSTALL" ] && [ -n "$AGE_PASSWORD" ]; then
   installAge
   decryptKey
 else
-  logg info 'Skipping Age key decryption process'
+  logg info 'Skipping Age key decryption process - `HEADLESS_INSTALL` and `AGE_PASSWORD` should be passed in as env variables to automate the process'
 fi
 
 ### Ensure proper permissions on private key
diff --git a/home/.chezmoiscripts/universal/run_onchange_before_11-install-docker.sh.tmpl b/home/.chezmoiscripts/universal/run_onchange_before_11-install-docker.sh.tmpl
index 2d559d16..c99dc695 100644
--- a/home/.chezmoiscripts/universal/run_onchange_before_11-install-docker.sh.tmpl
+++ b/home/.chezmoiscripts/universal/run_onchange_before_11-install-docker.sh.tmpl
@@ -21,8 +21,6 @@ if [ -d /Applications ] && [ -d /System ]; then
     if [ ! -d /Applications/Docker.app ]; then
         logg info 'Installing Docker on macOS via Homebrew cask'
         brew install --cask docker
-        logg info 'Installing Docker Credential Helper'
-        brew install docker-credential-helper
         logg info 'Removing Docker.app quarantine status'
         sudo xattr -r -d com.apple.quarantine /Applications/Docker.app
     else
@@ -163,7 +161,7 @@ if [ ! -d /Applications ] || [ ! -d /System ]; then
     if ! command -v docker-credential-secretservice > /dev/null; then
         installCredentialSecretService
     fi
-    
+
     if ! command -v runsc > /dev/null; then
         # Install gVisor
         gVisorPreBuilt || PRE_BUILT_EXIT_CODE=$?