Merge pull request #5786 from obrienmd/add-ed25519-pubkey-check

Detect id_ed25519.pub in git:public-key command
This commit is contained in:
josegonzalez
2023-05-13 14:25:18 -04:00
committed by GitHub

View File

@@ -257,11 +257,15 @@ cmd-git-public-key() {
local cmd="git:public-key"
[[ "$1" == "$cmd" ]] && shift 1
if [[ ! -f "$DOKKU_ROOT/.ssh/id_rsa.pub" ]]; then
fn-git-auth-error
if [[ -f "$DOKKU_ROOT/.ssh/id_ed25519.pub" ]]; then
cat "$DOKKU_ROOT/.ssh/id_ed25519.pub"
return
elif [[ -f "$DOKKU_ROOT/.ssh/id_rsa.pub" ]]; then
cat "$DOKKU_ROOT/.ssh/id_rsa.pub"
return
fi
cat "$DOKKU_ROOT/.ssh/id_rsa.pub"
fn-git-auth-error
}
cmd-git-report() {