From 5d8e505ce5d179f321f2ee80927a8a0bd78979c4 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Mon, 8 Jul 2019 18:04:30 +0200
Subject: guix-install.sh: Check for PGP key separately.

* etc/guix-install.sh (chk_gpg_keyring): New function to handle the
public key check previously stuffed into chk_require.
(main): Call it.
---
 etc/guix-install.sh | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'etc/guix-install.sh')

diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index 05e2ef8157..3f05796339 100755
--- a/etc/guix-install.sh
+++ b/etc/guix-install.sh
@@ -100,6 +100,11 @@ chk_require()
           return 1; }
     
     _msg "${PAS}verification of required commands completed"
+}
+
+chk_gpg_keyring()
+{ # Check whether the Guix release signing public key is present.
+    _debug "--- [ $FUNCNAME ] ---"
 
     gpg --list-keys ${OPENPGP_SIGNING_KEY_ID} >/dev/null 2>&1 || (
         _err "${ERR}Missing OpenPGP public key.  Fetch it with this command:"
@@ -415,6 +420,7 @@ main()
 
     chk_term
     chk_require "${REQUIRE[@]}"
+    chk_gpg_keyring
     chk_init_sys
     chk_sys_arch
 
-- 
cgit v1.2.3