From 3b2924d7d9beb494fa530b13f0f742f921fb951f Mon Sep 17 00:00:00 2001
From: "Andrey M. Smirnov" <allter@gmail.com>
Date: Wed, 27 Jul 2016 22:33:10 +0000
Subject: [PATCH] Correct arguments for remote deletion command + debug
 printing it those arguments and a command input

---
 osync.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/osync.sh b/osync.sh
index a7db1f4..65a7252 100755
--- a/osync.sh
+++ b/osync.sh
@@ -2075,8 +2075,11 @@ function _delete_remote {
 	fi
 
 #TODO: check output file without & and sleep 5
-$SSH_CMD ERROR_ALERT=0 sync_on_changes=$sync_on_changes _SILENT=$_SILENT _DEBUG=$_DEBUG _DRYRUN=$_DRYRUN _VERBOSE=$_VERBOSE COMMAND_SUDO=$COMMAND_SUDO FILE_LIST="$(EscapeSpaces "$TARGET_STATE_DIR/$deleted_list_file")" REPLICA_DIR="$(EscapeSpaces "$replica_dir")" DELETE_DIR="$(EscapeSpaces "$deletion_dir")" FAILED_DELETE_LIST="$(EscapeSpaces "${TARGET[1]}${TARGET[3]}/$deleted_failed_list_file")" 'bash -s' << 'ENDSSH' > "$RUN_DIR/$PROGRAM.remote_deletion.$SCRIPT_PID" 2>&1
-
+local TARGET_STATE_DIR="${TARGET[1]}${TARGET[3]}"
+local DELETE_CMD=(
+$SSH_CMD ERROR_ALERT=0 sync_on_changes=$sync_on_changes _SILENT=$_SILENT _DEBUG=$_DEBUG _DRYRUN=$_DRYRUN _VERBOSE=$_VERBOSE COMMAND_SUDO=$COMMAND_SUDO FILE_LIST="$(EscapeSpaces "$TARGET_STATE_DIR/$deleted_list_file")" REPLICA_DIR="$(EscapeSpaces "$replica_dir")" DELETE_DIR="$(EscapeSpaces "$deletion_dir")" FAILED_DELETE_LIST="$(EscapeSpaces "${TARGET[1]}${TARGET[3]}/$deleted_failed_list_file")" 'bash -s'
+)
+local DELETE_CMD_INPUT = $(cat << 'ENDSSH'
 	## The following lines are executed remotely
 	function _logger {
 		local value="${1}" # What to log
@@ -2177,6 +2180,11 @@ $SSH_CMD ERROR_ALERT=0 sync_on_changes=$sync_on_changes _SILENT=$_SILENT _DEBUG=
 	done
 	IFS=$OLD_IFS
 ENDSSH
+)
+Logger "DELETE_CMD_INPUT: $DELETE_CMD_INPUT" "DEBUG"
+Logger "DELETE_CMD: ${DELETE_CMD[*]}" "DEBUG"
+
+	printf "%s" $DELETE_CMD_INPUT | ${DELETE_CMD[*]} > "$RUN_DIR/$PROGRAM.remote_deletion.$SCRIPT_PID" 2>&1
 
 	## Copy back the deleted failed file list
 	esc_source_file="$(EscapeSpaces "${TARGET[1]}${TARGET[3]}/$deleted_failed_list_file")"