From: Philip Hands <phil@hands.com>
Date: Fri, 2 Oct 2020 22:20:07 +0000 (+0200)
Subject: un-nest $() to make ksh cheerful
X-Git-Tag: V_8_5_P1~274
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce941c75ea9cd6c358508a5b206809846c8d9240;p=thirdparty%2Fopenssh-portable.git

un-nest $() to make ksh cheerful
---

diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index 11c9463ba..ee3f6374c 100644
--- a/contrib/ssh-copy-id
+++ b/contrib/ssh-copy-id
@@ -237,6 +237,7 @@ populate_new_ids() {
 #    optionally takes an alternative path for authorized_keys
 installkeys_sh() {
   AUTH_KEY_FILE=${1:-.ssh/authorized_keys}
+  AUTH_KEY_DIR=$(dirname "${AUTH_KEY_FILE}")
 
   # In setting INSTALLKEYS_SH:
   #    the tr puts it all on one line (to placate tcsh)
@@ -249,7 +250,7 @@ installkeys_sh() {
   INSTALLKEYS_SH=$(tr '\t\n' ' ' <<-EOF
 	cd;
 	umask 077;
-	mkdir -p $(dirname "${AUTH_KEY_FILE}") &&
+	mkdir -p "${AUTH_KEY_DIR}" &&
 	  { [ -z \`tail -1c ${AUTH_KEY_FILE} 2>/dev/null\` ] || echo >> ${AUTH_KEY_FILE}; } &&
 	  cat >> ${AUTH_KEY_FILE} ||
 	  exit 1;