[neon/infrastructure/pangea-data] imager/config-hooks-neon: | gpg --dearmor | sudo tee

[Carlos De Maine]

Git commit 113ca695aafcae1dad33749b3874b613358e8005 by Carlos De Maine.
Committed on 07/08/2024 at 14:38.
Pushed by carlosdem into branch 'master'.

| gpg --dearmor | sudo tee

M  +4    -4    imager/config-hooks-neon/repo.sh

https://invent.kde.org/neon/infrastructure/pangea-data/-/commit/113ca695aafcae1dad33749b3874b613358e8005

diff --git a/imager/config-hooks-neon/repo.sh b/imager/config-hooks-neon/repo.sh
index 33082f8..960e10a 100644
--- a/imager/config-hooks-neon/repo.sh
+++ b/imager/config-hooks-neon/repo.sh
@@ -5,7 +5,7 @@
 set -ex
 echo "config-hooks-neon -- **-repo"
 
-#if [ "$VERSION_CODENAME" = "jammy" ]; then
+if [ "$VERSION_CODENAME" = "jammy" ]; then
 apt install -y dirmngr gnupg1
 ARGS="--batch --verbose"
 GPG="gpg1"
@@ -22,10 +22,10 @@ apt-key export '444D ABCF 3667 D028 3F89  4EDD E6D4 7362 5575 1E5D' | $GPG \
   echo "deb http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main" >> config/archives/neon.list
   echo "deb-src http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main" >> config/archives/neon.list
 
-#else
+else
 
 apt install -y curl
-curl -sS https://archive.neon.kde.org/public.key | tee /etc/apt/keyrings/neon-archive-keyring-pubkey.gpg
+curl -sS https://archive.neon.kde.org/public.key | gpg --dearmor | sudo tee /etc/apt/keyrings/neon-archive-keyring-pubkey.gpg
 
 echo "# KDE neon sources have moved to /etc/apt/sources.list.d/neon.sources" >> config/archives/neon.list
 
@@ -41,6 +41,6 @@ EOF
 
 cat config/archives/neon.sources
 apt update
-#fi
+fi