tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

shellcheck tidyage 

SSH-Copy-ID-Upstream: 5b08f840e78ac544288b3983010a1b0585e966fd
This commit is contained in:
Philip Hands 2020-10-03 21:45:16 +02:00 committed by Darren Tucker
parent 108676c3f2
commit f7c3a39b01
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/ssh-copy-id
View File

@ -262,6 +262,7 @@ EOF
printf "exec sh -c '%s'" "${INSTALLKEYS_SH}" printf "exec sh -c '%s'" "${INSTALLKEYS_SH}"
} }
#shellcheck disable=SC2120 # the 'eval set' confuses this
installkeys_via_sftp() { installkeys_via_sftp() {
# repopulate "$@" inside this function # repopulate "$@" inside this function
@ -269,22 +270,24 @@ installkeys_via_sftp() {
L_KEYS=$SCRATCH_DIR/authorized_keys L_KEYS=$SCRATCH_DIR/authorized_keys
L_SHARED_CON=$SCRATCH_DIR/master-conn L_SHARED_CON=$SCRATCH_DIR/master-conn
$SSH -f -N -M -S $L_SHARED_CON "$@" $SSH -f -N -M -S "$L_SHARED_CON" "$@"
L_CLEANUP="$SSH -S $L_SHARED_CON -O exit 'ignored' >/dev/null 2>&1 ; $SCRATCH_CLEANUP" L_CLEANUP="$SSH -S $L_SHARED_CON -O exit 'ignored' >/dev/null 2>&1 ; $SCRATCH_CLEANUP"
#shellcheck disable=SC2064
trap "$L_CLEANUP" EXIT TERM INT QUIT trap "$L_CLEANUP" EXIT TERM INT QUIT
sftp -b - -o "ControlPath=$L_SHARED_CON" "ignored" <<-EOF || return 1 sftp -b - -o "ControlPath=$L_SHARED_CON" "ignored" <<-EOF || return 1
-get .ssh/authorized_keys $L_KEYS -get .ssh/authorized_keys $L_KEYS
EOF EOF
# add a newline or create file if it's missing, same like above # add a newline or create file if it's missing, same like above
[ -z "$(tail -1c $L_KEYS 2>/dev/null)" ] || echo >> $L_KEYS [ -z "$(tail -1c "$L_KEYS" 2>/dev/null)" ] || echo >> "$L_KEYS"
# append the keys being piped in here # append the keys being piped in here
cat >> $L_KEYS cat >> "$L_KEYS"
sftp -b - -o "ControlPath=$L_SHARED_CON" "ignored" <<-EOF || return 1 sftp -b - -o "ControlPath=$L_SHARED_CON" "ignored" <<-EOF || return 1
-mkdir .ssh -mkdir .ssh
chmod 700 .ssh chmod 700 .ssh
put $L_KEYS .ssh/authorized_keys put $L_KEYS .ssh/authorized_keys
chmod 600 .ssh/authorized_keys chmod 600 .ssh/authorized_keys
EOF EOF
#shellcheck disable=SC2064
eval "$L_CLEANUP" && trap "$SCRATCH_CLEANUP" EXIT TERM INT QUIT eval "$L_CLEANUP" && trap "$SCRATCH_CLEANUP" EXIT TERM INT QUIT
} }
@ -339,6 +342,7 @@ case "$REMOTE_VERSION" in
if ! [ "$DRY_RUN" ] ; then if ! [ "$DRY_RUN" ] ; then
printf '%s\n' "$NEW_IDS" | \ printf '%s\n' "$NEW_IDS" | \
if [ "$SFTP" ] ; then if [ "$SFTP" ] ; then
#shellcheck disable=SC2119
installkeys_via_sftp installkeys_via_sftp
else else
$SSH "$@" "$(installkeys_sh)" $SSH "$@" "$(installkeys_sh)"