[neon/infrastructure/pangea-data] imager/config-hooks-neon: make sure pubring.gpg is in place to sign preinstall-pool

[Carlos De Maine]

Git commit 4cce5dbc4fec4bccb2ce4fb3a696cfa348b05015 by Carlos De Maine.
Committed on 06/08/2024 at 00:37.
Pushed by carlosdem into branch 'master'.

make sure pubring.gpg is in place to sign preinstall-pool

M  +5    -7    imager/config-hooks-neon/99-preinstalled-pool.sh

https://invent.kde.org/neon/infrastructure/pangea-data/-/commit/4cce5dbc4fec4bccb2ce4fb3a696cfa348b05015

diff --git a/imager/config-hooks-neon/99-preinstalled-pool.sh b/imager/config-hooks-neon/99-preinstalled-pool.sh
index f222ee8..9877d6a 100644
--- a/imager/config-hooks-neon/99-preinstalled-pool.sh
+++ b/imager/config-hooks-neon/99-preinstalled-pool.sh
@@ -1,26 +1,24 @@
 
 mkdir -vp -m 0700 config/gnupg
 mkdir -vp -m 0700 config/indices
-mkdir -vp -m 0700 configgnupg/private-keys-v1.d/
 
 # Make sure we use a suitably strong digest algorithm. SHA1 is deprecated and
 # makes apt angry.
-cat > config/gnupg/gpg.conf <<EOF
+cat > config/gnupg/gpg.conf << @@EOF >
 personal-digest-preferences SHA512
 cert-digest-algo SHA512
 default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed
-EOF
+@@EOF
 
 # confirm the conf file
 cat config/gnupg/gpg.conf
 # make sure we have a copy of the neon-archive-keyring.gpg
 # to be used as the preinstalled-pool's pubring.gpg
-#wget https://archive.neon.kde.org/public.key
+wget https://archive.neon.kde.org/public.key
 #gpg --home config/gnupg --import public.key
-
-#cp public.key config/gnupg/pubring.gpg
+cp -v public.key config/gnupg/pubring.gpg
 ls -lsh config/gnupg/
-#cat config/gnupg/pubring.gpg
+cat config/gnupg/pubring.gpg
 
 for component in $COMPONENTS; do
    (cd config/indices && \