From 6009497eb8a9a99457a71c0bee6982583d8c547c Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Mon, 1 Jul 2019 06:15:19 +0200
Subject: update-me.in: fix type, be more verbose on editing

---
 update-me.in | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

(limited to 'update-me.in')

diff --git a/update-me.in b/update-me.in
index d5b50c1..dd01965 100644
--- a/update-me.in
+++ b/update-me.in
@@ -14,9 +14,22 @@ if [ -d '#ETCDIR#/pacman.d' ]; then
     "${postCmds[@]}"
   )
   fix-pacman-gpg-keyserver-conf() {
-    sed -i '
-      s@^keyserver hkp://pool\.sks-keyservers\.net$@keyserver hkp://keys.gnupg.net@
-    ' '#ETCDIR/pacman.d/gnupg/gpg.conf' '/var/lib/archbuild'/*-build/*/'#ETCDIR/pacman.d/gnupg/gpg.conf' || true
+    for gpg_conf in \
+      '#ETCDIR#/pacman.d/gnupg/gpg.conf' \
+      '/var/lib/archbuild'/*-build/*/'#ETCDIR#/pacman.d/gnupg/gpg.conf'; do
+      [ -f "${gpg_conf}" ] || continue
+      sed -i '
+        \@^keyserver hkp://pool\.sks-keyservers\.net$@ {
+          w /dev/stderr
+          s@^.*$@keyserver hkp://keys.gnupg.net@
+        }
+      ' "${gpg_conf}" 2>&1 | \
+        sed '
+          s/^/"/
+          s@$@" -> "keyserver hkp://keys.gnupg.net"@
+          1 i modified '"${gpg_conf}"':
+        '
+    done
   }
 fi
 
-- 
cgit v1.2.3-54-g00ecf