From: Philip Hands <phil@hands.com>
Date: Tue, 23 May 2023 18:52:13 +0000 (+0200)
Subject: make -x also apply to the target script
X-Git-Tag: V_9_4_P1~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=288482f53613f3e74544eb92deeb24f7c7f1f371;p=thirdparty%2Fopenssh-portable.git

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 23965b241..ce16ea0bc 100644
--- 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}";