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 ac0db7b6414f1a335f7e0ea04afc24f71092652b..8c84385d36af1affa36fdeddbcea670a2447ddb6 100644 (file)
--- 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