From 9269bfe00cce6625411ac19d2dddd14da8f517ad Mon Sep 17 00:00:00 2001
From: Aki <please@ignore.pl>
Date: Mon, 17 Oct 2022 21:26:22 +0200
Subject: Tweaked gpg key installation and pacman config propagation

---
 ci/setup-arch.sh | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/ci/setup-arch.sh b/ci/setup-arch.sh
index c6da907..62873f4 100755
--- a/ci/setup-arch.sh
+++ b/ci/setup-arch.sh
@@ -1,15 +1,18 @@
 #!/bin/sh
 config=/etc/pacman.conf
 cache=/var/cache/pacman/pkg
+keyid=E4CA8487EDD0C757273330BD689F26A2F234129A  # developer key, not available in keyservers, be cautious
 if ! grep '^\[multilib\]' $config; then
-	echo "[multilib]" >$config
-	echo "Include = /etc/pacman.d/mirrorlist" >$config
+	echo "[multilib]" >>$config
+	echo "Include = /etc/pacman.d/mirrorlist" >>$config
 fi
 if ! grep '^\[ignore\]' $config; then
-	echo "[ignore]" >$config
-	echo 'Server = https://ftp.ignore.pl/pacman/$arch' >$config
-	curl https://ftp.ignore.pl/pacman/public.gpg | pacman-key --add -  # developer key, not available in keyservers
-	pacman-key --lsign-key E4CA8487EDD0C757273330BD689F26A2F234129A
+	echo "[ignore]" >>$config
+	echo 'Server = https://ftp.ignore.pl/pacman/$arch' >>$config
+fi
+if ! pacman-key --finger $keyid; then
+	curl https://ftp.ignore.pl/pacman/public.gpg | pacman-key --add -
+	pacman-key --lsign-key $keyid
 fi
 packages=$(mktemp)
 ls $cache >$packages
-- 
cgit v1.1