From 862330392af9797c8a470472e80f5c8a4a99a61e Mon Sep 17 00:00:00 2001
From: Igor Velkov <iav@iav.lv>
Date: Sun, 11 Dec 2022 14:14:47 +0200
Subject: [PATCH] Fix #181: create folder for keyring if not exists (#182)

---
 debian-software | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian-software b/debian-software
index 4709722..e201b96 100755
--- a/debian-software
+++ b/debian-software
@@ -640,14 +640,18 @@ install_docker ()
 {
 case $distribution in
 	jammy)
-		curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+		mkdir -p /etc/apt/keyrings
+		curl -fsSL https://download.docker.com/linux/ubuntu/gpg \
+			| gpg --dearmor -o /etc/apt/keyrings/docker.gpg
 		echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" \
 			> /etc/apt/sources.list.d/docker.list
 		debconf-apt-progress -- apt-get update
 		debconf-apt-progress -- apt-get install -y -qq --no-install-recommends docker-ce docker-ce-cli containerd.io
 	;;
 	bullseye|buster)
-		curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+		mkdir -p /etc/apt/keyrings
+		curl -fsSL https://download.docker.com/linux/debian/gpg \
+			| gpg --dearmor -o /etc/apt/keyrings/docker.gpg
 		echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian $(lsb_release -cs) stable" > \
 			/etc/apt/sources.list.d/docker.list
 		debconf-apt-progress -- apt-get update
@@ -1543,8 +1547,7 @@ fi
 install_yggdrasil ()
 {
 curl -fsSL "https://neilalexander.s3.dualstack.eu-west-2.amazonaws.com/deb/key.txt" \
-	| gpg --dearmor - \
-	| sudo tee /usr/share/keyrings/yggdrasil.gpg > /dev/null
+	| gpg --dearmor -o /usr/share/keyrings/yggdrasil.gpg
 echo 'deb [signed-by=/usr/share/keyrings/yggdrasil.gpg] http://neilalexander.s3.dualstack.eu-west-2.amazonaws.com/deb/ debian yggdrasil' \
 	> /etc/apt/sources.list.d/yggdrasil.list
 debconf-apt-progress -- apt-get update