Merge pull request #4 from phemmer/run-nofork

don't fork on 'run'
This commit is contained in:
dlage
2014-03-17 19:37:05 +00:00

View File

@@ -83,22 +83,18 @@ class Foreman::CLI < Thor
engine.load_procfile(procfile)
end
pid = fork do
begin
engine.env.each { |k,v| ENV[k] = v }
if args.size == 1 && process = engine.process(args.first)
process.exec(:env => engine.env)
else
exec args.shelljoin
end
rescue Errno::EACCES
error "not executable: #{args.first}"
rescue Errno::ENOENT
error "command not found: #{args.first}"
begin
engine.env.each { |k,v| ENV[k] = v }
if args.size == 1 && process = engine.process(args.first)
process.exec(:env => engine.env)
else
exec args.shelljoin
end
rescue Errno::EACCES
error "not executable: #{args.first}"
rescue Errno::ENOENT
error "command not found: #{args.first}"
end
Process.wait(pid)
exit $?.exitstatus
end
desc "version", "Display Foreman gem version"