haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #8385 from chrisroberts/encoding/windows 

Fix issues with Windows encoding
This commit is contained in:
Chris Roberts 2017-03-23 09:24:02 -07:00 committed by GitHub
parent 2a8b3f40ac 154c3be0d4
commit 7b8ab871dc
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/vagrant/util/safe_exec.rb
View File

@ -40,7 +40,15 @@ module Vagrant
Process.wait(pid) Process.wait(pid)
end end
else else
Kernel.exec(command, *args) if Vagrant::Util::Platform.windows?
@@logger.debug("Converting command and arguments to single string for exec")
@@logger.debug("Command: `#{command.inspect}` Args: `#{args.inspect}`")
full_command = "#{command} #{args.join(" ")}"
@@logger.debug("Converted command: #{full_command}")
Kernel.exec(full_command)
else
Kernel.exec(command, *args)
end
end end
rescue *rescue_from rescue *rescue_from
# We retried already, raise the issue and be done # We retried already, raise the issue and be done

1
lib/vagrant/util/subprocess.rb
View File

@ -25,7 +25,6 @@ module Vagrant
def initialize(*command) def initialize(*command)
@options = command.last.is_a?(Hash) ? command.pop : {} @options = command.last.is_a?(Hash) ? command.pop : {}
@command = command.dup @command = command.dup
@command = @command.map { |s| s.encode(Encoding.default_external) }
@command[0] = Which.which(@command[0]) if !File.file?(@command[0]) @command[0] = Which.which(@command[0]) if !File.file?(@command[0])
if !@command[0] if !@command[0]
raise Errors::CommandUnavailableWindows, file: command[0] if Platform.windows? raise Errors::CommandUnavailableWindows, file: command[0] if Platform.windows?