From 8ff20ec95f4377021ed5e9b2331320f5c5a34cea Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Mon, 14 Mar 2016 09:24:03 +1100
Subject: Quote variables that may contain whitespace.

The variable $L_TMP_ID_FILE needs to be surrounded by quotes in order to
survive paths containing whitespace.  bz#2551, from Corinna Vinschen via
Philip Hands.
---
 contrib/ssh-copy-id | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'contrib/ssh-copy-id')

diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index afde8b170..bef5c95d9 100644
--- a/contrib/ssh-copy-id
+++ b/contrib/ssh-copy-id
@@ -233,17 +233,17 @@ populate_new_ids() {
             -o ControlPath=none \
             -o LogLevel=INFO \
             -o PreferredAuthentications=publickey \
-            -o IdentitiesOnly=yes "$@" exit 2>$L_TMP_ID_FILE.stderr </dev/null
+            -o IdentitiesOnly=yes "$@" exit 2>"$L_TMP_ID_FILE.stderr" </dev/null
         if [ "$?" = "$L_SUCCESS" ] ; then
-          : > $L_TMP_ID_FILE
+          : > "$L_TMP_ID_FILE"
         else
-          grep 'Permission denied' $L_TMP_ID_FILE.stderr >/dev/null || {
-            sed -e 's/^/ERROR: /' <$L_TMP_ID_FILE.stderr >$L_TMP_ID_FILE
+          grep 'Permission denied' "$L_TMP_ID_FILE.stderr" >/dev/null || {
+            sed -e 's/^/ERROR: /' <"$L_TMP_ID_FILE.stderr" >"$L_TMP_ID_FILE"
             cat >/dev/null #consume the other keys, causing loop to end
           }
         fi
 
-        cat $L_TMP_ID_FILE
+        cat "$L_TMP_ID_FILE"
       done
     }
   )
-- 
cgit v1.2.3