From: Philip Hands <phil@hands.com>
Date: Wed, 24 Feb 2021 22:43:16 +0000 (+0100)
Subject: tidy the $INSTALLKEY_SH code layout a little
X-Git-Tag: V_8_5_P1~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=476ac8e9d33dbf96ef97aab812b8d7089d0cdc24;p=thirdparty%2Fopenssh-portable.git

tidy the $INSTALLKEY_SH code layout a little

SSH-Copy-ID-Upstream: 78178aa5017222773e4c23d9001391eeaeca8983
---

diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index 5fee15076..cd122def3 100644
--- a/contrib/ssh-copy-id
+++ b/contrib/ssh-copy-id
@@ -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;