From cb1a3e5609a8842cf93deb19f81572c62115c420 Mon Sep 17 00:00:00 2001
From: Michael de Wit <mjwwit@gmail.com>
Date: Fri, 29 Nov 2019 10:53:23 +0100
Subject: [PATCH] Revert "removed not working ssh key type detection"

This reverts commit 17234442892d77e0fa601b21a945f55e829ef5a5.
---
 upload.sh | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/upload.sh b/upload.sh
index 35ead58..4aa03db 100755
--- a/upload.sh
+++ b/upload.sh
@@ -56,10 +56,7 @@ if [[ -n "$PLUGIN_DELETE" && "$PLUGIN_DELETE" == "true" ]]; then
     expr="$expr --del"
 fi
 
-home="/root"
-keyfile="$home/.ssh/id"
-
-expr="$expr -e 'ssh -i $keyfile -p %s -o UserKnownHostsFile=/dev/null -o LogLevel=quiet -o StrictHostKeyChecking=no'"
+expr="$expr -e 'ssh -p %s -o UserKnownHostsFile=/dev/null -o LogLevel=quiet -o StrictHostKeyChecking=no'"
 
 # Include
 IFS=','; read -ra INCLUDE <<< "$PLUGIN_INCLUDE"
@@ -82,11 +79,24 @@ done
 expr="$expr $SOURCE"
 
 # Prepare SSH
+home="/root"
+
 mkdir -p "$home/.ssh"
 
 printf "StrictHostKeyChecking no\n" > "$home/.ssh/config"
 chmod 0700 "$home/.ssh/config"
 
+keyfile="$home/.ssh/id_rsa"
+echo "$SSH_KEY" | grep -q "ssh-ed25519"
+if [ $? -eq 0 ]; then
+    printf "Using ed25519 based key\n"
+    keyfile="$home/.ssh/id_ed25519"
+fi
+echo "$SSH_KEY" | grep -q "ecdsa-"
+if [ $? -eq 0 ]; then
+    printf "Using ecdsa based key\n"
+    keyfile="$home/.ssh/id_ecdsa"
+fi
 echo "$SSH_KEY" > $keyfile
 chmod 0600 $keyfile