diff options
author | Philip Hands <phil@hands.com> | 2020-10-13 14:12:58 +0200 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2021-02-26 01:06:15 +1100 |
commit | 3594b3b015f6014591da88ba71bf6ff010be7411 (patch) | |
tree | 4fa17d75fbbf3d71f3c12d79a783c346e1cf8136 /contrib | |
parent | 333e25f7bc43cee6e36f766e39dad6f9918b318c (diff) | |
download | openssh-git-3594b3b015f6014591da88ba71bf6ff010be7411.tar.gz |
use $AUTH_KEY_DIR, now that we have it
since that was a change made since jjelen's commit was written
also, quote the variables
SSH-Copy-ID-Upstream: 588cd8e5cbf95f3443d92b9ab27c5d73ceaf6616
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/ssh-copy-id | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id index 3105e78b..b8a67419 100644 --- a/contrib/ssh-copy-id +++ b/contrib/ssh-copy-id @@ -252,11 +252,11 @@ installkeys_sh() { cd; umask 077; mkdir -p "${AUTH_KEY_DIR}" && - { [ -z \`tail -1c ${AUTH_KEY_FILE} 2>/dev/null\` ] || echo >> ${AUTH_KEY_FILE}; } && - cat >> ${AUTH_KEY_FILE} || + { [ -z \`tail -1c ${AUTH_KEY_FILE} 2>/dev/null\` ] || echo >> "${AUTH_KEY_FILE}"; } && + cat >> "${AUTH_KEY_FILE}" || exit 1; if type restorecon >/dev/null 2>&1; then - restorecon -F $(dirname "${AUTH_KEY_FILE}") ${AUTH_KEY_FILE}; + restorecon -F "${AUTH_KEY_DIR}" "${AUTH_KEY_FILE}"; fi EOF ) |