diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-08-31 22:11:50 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-08-31 22:11:50 +0100 |
| commit | bae00bb1cc392e1cf408369809b9cf85468bef42 (patch) | |
| tree | 17103af6eeb5de96c72beda1debce28950cc7fea /railties/lib/commands/dbconsole.rb | |
| parent | 93c76b2fb08668bc4b8364cc8051476e6d1d15ba (diff) | |
| parent | ffd2cf167040b60c26d97c01598560c87bd4b2d3 (diff) | |
| download | rails-bae00bb1cc392e1cf408369809b9cf85468bef42.tar.gz rails-bae00bb1cc392e1cf408369809b9cf85468bef42.tar.bz2 rails-bae00bb1cc392e1cf408369809b9cf85468bef42.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'railties/lib/commands/dbconsole.rb')
| -rw-r--r-- | railties/lib/commands/dbconsole.rb | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/railties/lib/commands/dbconsole.rb b/railties/lib/commands/dbconsole.rb index 8002264f7e..e6f11a45db 100644 --- a/railties/lib/commands/dbconsole.rb +++ b/railties/lib/commands/dbconsole.rb @@ -33,11 +33,15 @@ end def find_cmd(*commands) dirs_on_path = ENV['PATH'].to_s.split(File::PATH_SEPARATOR) commands += commands.map{|cmd| "#{cmd}.exe"} if RUBY_PLATFORM =~ /win32/ - commands.detect do |cmd| - dirs_on_path.detect do |path| - File.executable? File.join(path, cmd) + + full_path_command = nil + found = commands.detect do |cmd| + dir = dirs_on_path.detect do |path| + full_path_command = File.join(path, cmd) + File.executable? full_path_command end - end || abort("Couldn't find database client: #{commands.join(', ')}. Check your $PATH and try again.") + end + found ? full_path_command : abort("Couldn't find database client: #{commands.join(', ')}. Check your $PATH and try again.") end case config["adapter"] |