Ticket #38122: ssh-copy-id.diff

bin/ssh-copy-id

@@ -1 @@
-#!/bin/sh
+#!/bin/bash
 
 # Shell script to install your public key on a remote machine
 # Takes the remote machine name as an argument.
@@ -25 +25 @@
 fi
 
 if [ -z "`eval $GET_ID`" ] && [ -r "${ID_FILE}" ] ; then
-  GET_ID="cat \"${ID_FILE}\""
+  GET_ID="cat ${ID_FILE}"
 fi
 
 if [ -z "`eval $GET_ID`" ]; then
@@ -38 +38 @@
   exit 1
 fi
 
-# strip any trailing colon
-host=`echo $1 | sed 's/:$//'`
-
-{ eval "$GET_ID" ; } | ssh $host "umask 077; test -d ~/.ssh || mkdir ~/.ssh ; cat >> ~/.ssh/authorized_keys" || exit 1
+{ eval "$GET_ID" ; } | ssh ${1%:} "umask 077; test -d .ssh || mkdir .ssh ; cat >> .ssh/authorized_keys" || exit 1
 
 cat <<EOF
-Now try logging into the machine, with "ssh '$host'", and check in:
+Now try logging into the machine, with "ssh '${1%:}'", and check in:
 
-  ~/.ssh/authorized_keys
+  .ssh/authorized_keys
 
 to make sure we haven't added extra keys that you weren't expecting.
 
 EOF
-