From 253ed08aa5bb742125acf0246fa7c9bd453c6ed6 Mon Sep 17 00:00:00 2001
From: AubsUK <68870168+AubsUK@users.noreply.github.com>
Date: Sat, 27 May 2023 19:39:37 +0100
Subject: [PATCH] Update apt key method

Current process of apt-key add is deprecated and the following warning received:

Warning: apt-key is deprecated. Manage keyring files in trusted.gpg.d instead (see apt-key(8))

https://stackoverflow.com/a/71384057/3457477 identifies that trusted.gpg.d still isn't secure enough and provides a detailed solution.
---
 RPiOS64-IA-Install.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/RPiOS64-IA-Install.sh b/RPiOS64-IA-Install.sh
index 799b82d..82e4e61 100644
--- a/RPiOS64-IA-Install.sh
+++ b/RPiOS64-IA-Install.sh
@@ -139,9 +139,10 @@ printf "
 hostnamectl set-hostname $HOSTNAME
 
 #### ADD SOURCE PIMOX7 + KEY & UPDATE & INSTALL RPI-KERNEL-HEADERS #######################################################################
+mkdir -p /etc/apt/keyrings/
+wget -O- https://raw.githubusercontent.com/pimox/pimox7/master/KEY.gpg | gpg --dearmor | sudo tee /etc/apt/keyrings/pimox.gpg > /dev/null
 printf "# PiMox7 Development Repo
-deb https://raw.githubusercontent.com/pimox/pimox7/master/ dev/ \n" > /etc/apt/sources.list.d/pimox.list
-curl https://raw.githubusercontent.com/pimox/pimox7/master/KEY.gpg |  apt-key add -
+deb [signed-by=/etc/apt/keyrings/pimox.gpg] https://raw.githubusercontent.com/pimox/pimox7/master/ dev/ \n" | sudo tee /etc/apt/sources.list.d/pimox.list
 apt update && apt upgrade -y
 
 #### REMOVE DHCP, CLEAN UP ###############################################################################################################