cr-publish-flight-logs: Refactor rsync -e option construction

Previously this was hardcoded.  Now we make a variable @ssh, and use
rsync's quoting scheme to transform it into a value suitable for -e.

No overall functional change, although now the rsync command contains
additional quotes in the -e option.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/cr-publish-flight-logs b/cr-publish-flight-logs
index 539318dc692605f8f405ca80d70fcdd4b39f0dd5..9e1365259b585ffeb0fac1981031a98bd41e0807 100755 (executable)
--- a/cr-publish-flight-logs
+++ b/cr-publish-flight-logs
@@ -61,8 +61,9 @@ sub copydir ($$) {
     return unless $c{"${cfgbase}Publish"};
     my $src = $c{$cfgbase}.$subdir."/";
     my $dst = $c{"${cfgbase}Publish"}.$subdir;
+    my @ssh = qw(ssh -o batchmode=yes);
     my @cmd= qw(rsync --compress --compress-level=9 --stats --delete -auH);
-    push @cmd, '-e', 'ssh -o batchmode=yes';
+    push @cmd, '-e', join(' ', map { s/\'/''/g; "'$_'"; } @ssh);
     #--bwlimit=50
     push @cmd, $src, $dst;
     print "+ @cmd\n";