From a2ed760fb4e2d6c5da44347a474f8778b2bec0c9 Mon Sep 17 00:00:00 2001
From: Brian Zalewski <brian@megabyte.space>
Date: Wed, 30 Nov 2022 08:45:17 +0000
Subject: [PATCH] Update
 .local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_91-configure-gpg.tmpl,
 .local/share/chezmoi/home/.chezmoiscripts/universal/run_once_before_decrypt-age-key.tmpl

---
 .../universal/run_once_before_decrypt-age-key.tmpl     | 10 +++++-----
 .../run_onchange_before_91-configure-gpg.tmpl          |  9 ++++++++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.local/share/chezmoi/home/.chezmoiscripts/universal/run_once_before_decrypt-age-key.tmpl b/.local/share/chezmoi/home/.chezmoiscripts/universal/run_once_before_decrypt-age-key.tmpl
index 97f744f4..8d52a97b 100644
--- a/.local/share/chezmoi/home/.chezmoiscripts/universal/run_once_before_decrypt-age-key.tmpl
+++ b/.local/share/chezmoi/home/.chezmoiscripts/universal/run_once_before_decrypt-age-key.tmpl
@@ -2,8 +2,8 @@
 
 XDG_CONFIG_HOME="$HOME/.config"
 
-if [ ! -f "${XDG_CONFIG_HOME}/age/chezmoi.txt" ]; then
-  mkdir -p "${XDG_CONFIG_HOME}/age"
-  age --decrypt --output "${XDG_CONFIG_HOME}/age/chezmoi.txt" "{{ .chezmoi.sourceDir }}/chezmoi.txt.age"
-  chmod 600 "${XDG_CONFIG_HOME}/age/chezmoi.txt"
-fi
+#if [ ! -f "${XDG_CONFIG_HOME}/age/chezmoi.txt" ]; then
+#  mkdir -p "${XDG_CONFIG_HOME}/age"
+#  age --decrypt --output "${XDG_CONFIG_HOME}/age/chezmoi.txt" "{{ .chezmoi.sourceDir }}/chezmoi.txt.age"
+#  chmod 600 "${XDG_CONFIG_HOME}/age/chezmoi.txt"
+#fi
diff --git a/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_91-configure-gpg.tmpl b/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_91-configure-gpg.tmpl
index 3c2d3360..e7bec6bd 100644
--- a/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_91-configure-gpg.tmpl
+++ b/.local/share/chezmoi/home/.chezmoiscripts/universal/run_onchange_before_91-configure-gpg.tmpl
@@ -20,7 +20,14 @@ if [ -n "$KEYID" ] && command -v gpg > /dev/null; then
   KEYID_TRIMMED="$(echo "$KEYID" | sed 's/^0x//')"
   if ! gpg --list-secret-keys --keyid-format=long | grep "$KEYID_TRIMMED" > /dev/null; then
     logg info 'Attempting to download the specified public GPG key (`{{ .user.gpg.id }}`) from public keyservers'
-    gpg --recv "$KEYID"
+    gpg --recv "$KEYID" || EXIT_CODE=$?
+    if [ -n "$EXIT_CODE" ]; then
+      logg warn 'Error downloading public GPG key'
+      logg info 'Retrying after turning on debug mode and using the standard DNS resolver'
+      sudo pkill dirmngr
+      dirmngr --debug-all --daemon --standard-resolver
+      gpg --recv "$KEYID"
+    fi
   else
     logg info 'Key is already in keyring'
   fi