]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
tidy the $INSTALLKEY_SH code layout a little
authorPhilip Hands <phil@hands.com>
Wed, 24 Feb 2021 22:43:16 +0000 (23:43 +0100)
committerDarren Tucker <dtucker@dtucker.net>
Thu, 25 Feb 2021 14:06:15 +0000 (01:06 +1100)
SSH-Copy-ID-Upstream: 78178aa5017222773e4c23d9001391eeaeca8983

contrib/ssh-copy-id

index 5fee150763ab1e7cb834c42eb527bd7963cf2256..cd122def30a1f5d41472224a47d67f6caf856c47 100644 (file)
@@ -252,13 +252,13 @@ installkeys_sh() {
        cd;
        umask 077;
        mkdir -p "${AUTH_KEY_DIR}" &&
-         { [ -z \`tail -1c ${AUTH_KEY_FILE} 2>/dev/null\` ] || echo >> "${AUTH_KEY_FILE}" || exit 1; } &&
-         cat >> "${AUTH_KEY_FILE}" ||
-         exit 1;
+               { [ -z \`tail -1c ${AUTH_KEY_FILE} 2>/dev/null\` ] ||
+                       echo >> "${AUTH_KEY_FILE}" || exit 1; } &&
+               cat >> "${AUTH_KEY_FILE}" || exit 1;
        if type restorecon >/dev/null 2>&1; then
-         restorecon -F "${AUTH_KEY_DIR}" "${AUTH_KEY_FILE}";
+               restorecon -F "${AUTH_KEY_DIR}" "${AUTH_KEY_FILE}";
        fi
-EOF
+       EOF
   )
 
   # to defend against quirky remote shells: use 'exec sh -c' to get POSIX;