dinislage/foreman
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes #315

Browse Source
This commit is contained in:
Austin
2013-04-11 08:49:36 -07:00
parent 434f30fe42
commit ad4d59ae14
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/foreman/process.rb
+4 -4
View File
@@ -48,25 +48,25 @@ class Foreman::Process
env = @options[:env].merge(options[:env] || {})
output = options[:output] || $stdout
runner = "#{Foreman.runner}".gsub("'", "\\\\'") # To support directories with single quotes
cwd = "#{cwd}".gsub("'", "\\\\'")
cwdstr = "#{cwd}".gsub("'", "\\\\'")
if Foreman.windows?
Dir.chdir(cwd) do
Process.spawn env, expanded_command(env), :out => output, :err => output
end
elsif Foreman.jruby_18?
require "posix/spawn"
wrapped_command = "#{Foreman.runner} -d '#{cwd}' -p -- #{command}"
wrapped_command = "#{runner} -d '#{cwdstr}' -p -- #{command}"
POSIX::Spawn.spawn env, wrapped_command, :out => output, :err => output
elsif Foreman.ruby_18?
fork do
$stdout.reopen output
$stderr.reopen output
env.each { |k,v| ENV[k] = v }
wrapped_command = "#{Foreman.runner} -d '#{cwd}' -p -- #{command}"
wrapped_command = "#{runner} -d '#{cwdstr}' -p -- #{command}"
Kernel.exec wrapped_command
end
else
wrapped_command = "#{Foreman.runner} -d '#{cwd}' -p -- #{command}"
wrapped_command = "#{Foreman.runner} -d '#{cwdstr}' -p -- #{command}"
Process.spawn env, wrapped_command, :out => output, :err => output
end
end