summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2019-07-08 18:04:30 +0200
committerTobias Geerinckx-Rice <me@tobias.gr>2019-07-08 18:16:10 +0200
commit5d8e505ce5d179f321f2ee80927a8a0bd78979c4 (patch)
treea50b57f283bb47e665db7d02b07566ad7b094ad1 /etc
parent1d0bde2ee4009a301fee6ceeaf140396bb49a748 (diff)
downloadpatches-5d8e505ce5d179f321f2ee80927a8a0bd78979c4.tar
patches-5d8e505ce5d179f321f2ee80927a8a0bd78979c4.tar.gz
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.
Diffstat (limited to 'etc')
-rwxr-xr-xetc/guix-install.sh6
1 files changed, 6 insertions, 0 deletions
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