From 8d11664046812bd44e4b68e729054e458d67ec94 Mon Sep 17 00:00:00 2001
From: BenediktMKuehne <bennimail.4spam@gmail.com>
Date: Fri, 2 Aug 2024 05:39:10 +0000
Subject: [PATCH] fix docker source install

---
 installer.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/installer.sh b/installer.sh
index 9f72d44b..1dc965ab 100755
--- a/installer.sh
+++ b/installer.sh
@@ -258,20 +258,20 @@ install_debs(){
     # Add Docker's official GPG key:
     apt-get install -y ca-certificates curl gnupg
     install -m 0755 -d /etc/apt/keyrings
-    curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
-    chmod a+r /etc/apt/keyrings/docker.gpg
+    curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
+    chmod a+r /etc/apt/keyrings/docker.asc
     # Add the repository to Apt sources:
     # shellcheck source=/dev/null
-    echo \
-      "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \
-      $(. /etc/os-release && echo "${VERSION_CODENAME}") stable" | \
-      tee /etc/apt/sources.list.d/docker.list > /dev/null
+    echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
+    $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
     apt-get update -y
     apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
   fi
   # alias for compose to stay backwards comp
-  if docker --help | grep -q compose; then
-    alias docker-compose="docker compose"
+  if ! command -v docker-compose > /dev/null ; then
+    if docker --help | grep -q compose; then
+      alias docker-compose="docker compose"
+    fi
   fi
   # python3-dev
   if ! dpkg -l python3.10-dev &>/dev/null; then