Attachment #3175 for bug #2902

View | Details | Raw Unified | Return to bug 2902
Collapse All | Expand All




        usage
  }

  OPT=''
  OPTARG=''
  # implement something like getopt to avoid Solaris pain
  case "$1" in
    -i?*|-o?*|-p?*)
- 
--
contrib/ssh-copy-id | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Lines 262-268 populate_new_ids() { Link Here

(-)a/contrib/ssh-copy-id (-2 / +1 lines)
262	fi	262	fi
263	if [ -z "$NEW_IDS" ] ; then	263	if [ -z "$NEW_IDS" ] ; then
264	printf '\n%s: WARNING: All keys were skipped because they already exist on the remote system.\n' "$0" >&2	264	printf '\n%s: WARNING: All keys were skipped because they already exist on the remote system.\n' "$0" >&2
265	printf '\t\t(if you think this is a mistake, you may want to use -f option)\n\n' "$0" >&2	265	printf '\t\t(if you think this is a mistake, you may want to use -f option)\n\n' >&2
266	exit 0	266	exit 0
267	fi	267	fi
268	printf '%s: INFO: %d key(s) remain to be installed -- if you are prompted now it is to install the new keys\n' "$0" "$(printf '%s\n' "$NEW_IDS" \| wc -l)" >&2	268	printf '%s: INFO: %d key(s) remain to be installed -- if you are prompted now it is to install the new keys\n' "$0" "$(printf '%s\n' "$NEW_IDS" \| wc -l)" >&2
269	-

Return to bug 2902

Lines 112-118 do Link Here

(-)a/contrib/ssh-copy-id (-3 / +2 lines)
112	usage	112	usage
113	}	113	}
114		114
115	OPT= OPTARG=	115	OPT=''
		116	OPTARG=''
116	# implement something like getopt to avoid Solaris pain	117	# implement something like getopt to avoid Solaris pain
117	case "$1" in	118	case "$1" in
118	-i?\|-o?\|-p?*)	119	-i?\|-o?\|-p?*)
119	-
120	--
121	contrib/ssh-copy-id \| 2 +-	120	contrib/ssh-copy-id \| 2 +-
122	1 file changed, 1 insertion(+), 1 deletion(-)	121	1 file changed, 1 insertion(+), 1 deletion(-)