@@ -1,5 +1,7 @@ *SVN* +* Set :shell to false to run a command without wrapping it in "sh -c" [Jamis Buck] + * Don't request a pty by default [Jamis Buck] * Add a "match" remote dependency method [Adam Greene] CHANGELOG @@ -86,8 +86,18 @@ module Capistrano execute_command = Proc.new do |ch| logger.trace "executing command", ch[:server] if logger - escaped = replace_placeholders(command, ch).gsub(/[$\\`"]/) { |m| "\\#{m}" } - command_line = [environment, options[:shell] || "sh", "-c", "\"#{escaped}\""].compact.join(" ") + cmd = replace_placeholders(command, ch) + + if options[:shell] == false + shell = nil + else + shell = "#{options[:shell] || "sh"} -c" + cmd = cmd.gsub(/[$\\`"]/) { |m| "\\#{m}" } + cmd = "\"#{cmd}\"" + end + + command_line = [environment, shell, cmd].compact.join(" ") + ch.exec(command_line) ch.send_data(options[:data]) if options[:data] end lib/capistrano/command.rb @@ -112,6 +112,13 @@ class CommandTest < Test::Unit::TestCase Capistrano::Command.new("ls", [session], :shell => "/bin/bash") end + def test_successful_channel_with_shell_false_should_send_command_without_shell + session = setup_for_extracting_channel_action do |ch| + ch.expects(:exec).with(%(echo `hostname`)) + end + Capistrano::Command.new("echo `hostname`", [session], :shell => false) + end + def test_successful_channel_should_send_data_if_data_key_is_present session = setup_for_extracting_channel_action do |ch| ch.expects(:exec).with(%(sh -c "ls")) test/command_test.rb a899eb798e2d32bd1bfc3e3c1f6f9816a8f08613 Jamis Buck jamis@37signals.com http://github.com/jamis/capistrano/commit/ee78acbca63854f7f06f578f75f8604d46572ece ee78acbca63854f7f06f578f75f8604d46572ece 2007-08-31T20:31:53-07:00 2007-08-31T20:31:53-07:00 Set :shell to false to run a command without wrapping it in "sh -c" (closes #9290) git-svn-id: http://svn.rubyonrails.org/rails/tools/capistrano@7388 5ecf4fe2-1ee6-0310-87b1-e25e094e27de d716e8d1abae07e1e5bae666e15f69870caa5905 Jamis Buck jamis@37signals.com