diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-07-31 16:35:58 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-07-31 16:35:58 -0700 |
| commit | 46a458206f1117b87e672bc5aae046eaa832ee00 (patch) | |
| tree | b2692b98da56d23394605594c9dea5610719e7e0 /railties/lib/commands | |
| parent | a540725f0d3439ea3b0f938d04ceed87d3690d9d (diff) | |
| parent | 0b9bfbdebf402f4a149359a069dbeb05ea989b14 (diff) | |
| download | rails-46a458206f1117b87e672bc5aae046eaa832ee00.tar.gz rails-46a458206f1117b87e672bc5aae046eaa832ee00.tar.bz2 rails-46a458206f1117b87e672bc5aae046eaa832ee00.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'railties/lib/commands')
| -rw-r--r-- | railties/lib/commands/dbconsole.rb | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | railties/lib/commands/ncgi/listener | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | railties/lib/commands/ncgi/tracker | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/railties/lib/commands/dbconsole.rb b/railties/lib/commands/dbconsole.rb index 17acb7b68f..442526ae32 100644 --- a/railties/lib/commands/dbconsole.rb +++ b/railties/lib/commands/dbconsole.rb @@ -41,6 +41,8 @@ when "mysql" if config['password'] && include_password args << "--password=#{config['password']}" + elsif config['password'] && !config['password'].empty? + args << "-p" end args << config['database'] diff --git a/railties/lib/commands/ncgi/listener b/railties/lib/commands/ncgi/listener index 421c453f23..7079ef78a6 100644..100755 --- a/railties/lib/commands/ncgi/listener +++ b/railties/lib/commands/ncgi/listener @@ -1,4 +1,4 @@ -#!/usr/local/bin/ruby +#!/usr/bin/env ruby require 'stringio' require 'fileutils' @@ -83,4 +83,4 @@ end socket_path = ARGV.shift timeout = (ARGV.shift || 90).to_i -Listener.new(timeout, socket_path)
\ No newline at end of file +Listener.new(timeout, socket_path) diff --git a/railties/lib/commands/ncgi/tracker b/railties/lib/commands/ncgi/tracker index 859c9fa0e0..4ca12d779b 100644..100755 --- a/railties/lib/commands/ncgi/tracker +++ b/railties/lib/commands/ncgi/tracker @@ -1,4 +1,4 @@ -#!/usr/local/bin/ruby +#!/usr/bin/env ruby require 'drb' require 'thread' @@ -66,4 +66,4 @@ end socket_path = ARGV.shift instances = ARGV.shift.to_i t = Tracker.new(instances, socket_path) -t.background(ARGV.first ? ARGV.shift.to_i : 90)
\ No newline at end of file +t.background(ARGV.first ? ARGV.shift.to_i : 90) |