From 76c64f9bbf54c9f3b6915469f170d1f8c02be208 Mon Sep 17 00:00:00 2001
From: Markus Reiter
Date: Fri, 1 Dec 2017 22:07:21 +0100
Subject: Fix SystemCommand escaping … again.

---
 Library/Homebrew/cask/lib/hbc/system_command.rb | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'Library')

diff --git a/Library/Homebrew/cask/lib/hbc/system_command.rb b/Library/Homebrew/cask/lib/hbc/system_command.rb
index f64d85c07..86e4d2268 100644
--- a/Library/Homebrew/cask/lib/hbc/system_command.rb
+++ b/Library/Homebrew/cask/lib/hbc/system_command.rb
@@ -50,11 +50,7 @@ module Hbc
     end
 
     def command
-      @command ||= if sudo?
-        [*sudo_prefix, executable, *args]
-      else
-        [Shellwords.shellescape(executable), *args]
-      end
+      [*sudo_prefix, executable, *args]
     end
 
     private
@@ -85,8 +81,10 @@ module Hbc
     end
 
     def each_output_line(&b)
+      executable, *args = expanded_command
+
       raw_stdin, raw_stdout, raw_stderr, raw_wait_thr =
-        Open3.popen3(*expanded_command, **options)
+        Open3.popen3([executable, executable], *args, **options)
 
       write_input_to(raw_stdin)
       raw_stdin.close_write
-- 
cgit v1.2.3