From: Philip Hands <phil@hands.com>
Date: Thu, 1 Aug 2024 12:03:06 +0000 (+0200)
Subject: avoid extra space when no arg given to -i option
X-Git-Tag: V_9_9_P1~75
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=674b8f30f0dbacd787eb1e4e7e1ece34b5543d8f;p=thirdparty%2Fopenssh-portable.git

avoid extra space when no arg given to -i option

SSH-Copy-ID-Upstream: feca9e67e6e37c5653445d1c733569d7abb1770e
---

diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index ac0db7b64..8c84385d3 100644
--- a/contrib/ssh-copy-id
+++ b/contrib/ssh-copy-id
@@ -379,7 +379,7 @@ else
 
 	Number of key(s) added: $ADDED
 
-	Now try logging into the machine, with: "${SFTP:-ssh}${SEEN_OPT_I:+ -i $PRIV_ID_FILE}${SSH_PORT:+ -${PORT_OPT:-p} $SSH_PORT} ${OPTS_USER_HOST}"
+	Now try logging into the machine, with: "${SFTP:-ssh} ${SEEN_OPT_I:+-i${PRIV_ID_FILE:+ $PRIV_ID_FILE} }${SSH_PORT:+-${PORT_OPT:-p} $SSH_PORT }${OPTS_USER_HOST}"
 	and check to make sure that only the key(s) you wanted were added.
 
 	EOF