make -x also apply to the target script

SSH-Copy-ID-Upstream: 3c4214704f427bd0654adf9b0fc079253db21cf4

diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id
index 23965b241d4eb65c6457f8b4ff0765b82a0290b1..ce16ea0bc6789ea3b5566c454c68fc37de5786d0 100644 (file)
--- a/contrib/ssh-copy-id
+++ b/contrib/ssh-copy-id
@@ -142,6 +142,7 @@ do
       TARGET_PATH="${OPTARG}"
       ;;
     x)
+      SET_X="set -x;"
       set -x
       ;;
     h|\?)
@@ -254,6 +255,7 @@ installkeys_sh() {
   #    and if available restorecon is used to restore the SELinux context
   # OpenWrt has a special case for root only.
   INSTALLKEYS_SH=$(tr '\t\n' ' ' <<-EOF
+       $SET_X
        cd;
        umask 077;
        AUTH_KEY_FILE="${TARGET_PATH}";