From: Philip Hands <phil@hands.com>
Date: Tue, 13 Oct 2020 12:12:58 +0000 (+0200)
Subject: use $AUTH_KEY_DIR, now that we have it
X-Git-Tag: V_8_5_P1~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3594b3b015f6014591da88ba71bf6ff010be7411;p=thirdparty%2Fopenssh-portable.git

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
---

diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index 3105e78be..b8a67419b 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
   )