From 88ac36059bdf0d6876b176e6b32411df721f5e26 Mon Sep 17 00:00:00 2001
From: Nik Everett <nik9000@gmail.com>
Date: Mon, 7 Jan 2019 12:04:52 -0500
Subject: [PATCH] Asciidoctor: Fix raw xslt opts

My previous work on raw xslt opts added extra `'`s around every
variable. This broke all kinds of stuff like chunking and headers and,
well, almost everything! This fixes that and makes that `--verbose`
printing of commands a little more clear.
---
 lib/ES/Util.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ES/Util.pm b/lib/ES/Util.pm
index a8e75a93cb580..fdb04198a212b 100644
--- a/lib/ES/Util.pm
+++ b/lib/ES/Util.pm
@@ -420,7 +420,7 @@ sub rawxsltopts {
     while (@_) {
         my $key = shift;
         my $val = shift;
-        push @opts, '--stringparam', $key, "'$val'";
+        push @opts, '--stringparam', $key, "$val";
     }
     return @opts;
 }
@@ -451,7 +451,7 @@ sub run (@) {
     my ( $out, $err, $ok );
 
     if ( $Opts->{verbose} ) {
-        say "Running: @args";
+        say 'Running: ' . join(' ', map { "\"$_\"" } @args);
         ( $out, $err, $ok ) = tee { system(@args) == 0 };
     }
     else {