From 3d056b460527182395ca12235958a1f88d687a83 Mon Sep 17 00:00:00 2001 From: Brian Zalewski <59970525+ProfessorManhattan@users.noreply.github.com> Date: Wed, 6 Dec 2023 07:51:54 +0000 Subject: [PATCH] Latest --- .../universal/run_before_02-decrypt-age-key.sh.tmpl | 2 +- home/.chezmoitemplates/darwin/Brewfile | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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 abbe95b9..6c5f2292 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 @@ -78,7 +78,7 @@ decryptKey() { spawn age --decrypt --output "${XDG_CONFIG_HOME}/age/chezmoi.txt" "${XDG_DATA_HOME:-$HOME/.local/share}/home/key.txt.age" expect \"Enter passphrase:\" send \"${AGE_PASSWORD}\r\" - expect eof" > /dev/null || EXIT_CODE=$? + expect eof" &> /dev/null || EXIT_CODE=$? if [ -n "$EXIT_CODE" ]; then logg info 'There was an issue decrypting the key.txt.age file with the provided AGE_PASSWORD' decryptionFailure diff --git a/home/.chezmoitemplates/darwin/Brewfile b/home/.chezmoitemplates/darwin/Brewfile index 24681e40..39fa7055 100644 --- a/home/.chezmoitemplates/darwin/Brewfile +++ b/home/.chezmoitemplates/darwin/Brewfile @@ -14,6 +14,7 @@ end brew "age" # Ensure macOS Bash gets upgraded to 5+ brew "bash" +brew "expect" brew "gawk" brew "git-delta" brew "glow" @@ -21,6 +22,7 @@ brew "gnupg" brew "go" brew "gsed" brew "gum" +brew "htmlq" brew "jq" brew "node" brew "progress"