put the -i before -[pP] (matching man pages)

The man pages (ssh, sftp & ssh-copy-id) all list -i before the port
setting, so make the output match that order, which also seems more
natural with the port being next to the server.

SSH-Copy-ID-Upstream: 34d5d614172c78f9a42249466c4b81975b8883a1

diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index dfbdaa2f46cf3ca0da83814dade955788de5e3e2..ac0db7b6414f1a335f7e0ea04afc24f71092652b 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}${SSH_PORT:+ -${PORT_OPT:-p} $SSH_PORT}${SEEN_OPT_I:+ -i $PRIV_ID_FILE} ${OPTS_USER_HOST}"
+       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}"
        and check to make sure that only the key(s) you wanted were added.
 
        EOF