Skip to content

Commit

Permalink
find_cmd should return the full path of the db command
Browse files Browse the repository at this point in the history
[#1488 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
  • Loading branch information
kamal authored and jeremy committed Aug 10, 2009
1 parent 8c32248 commit 600a89f
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions railties/lib/commands/dbconsole.rb
Expand Up @@ -33,11 +33,15 @@
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"]
Expand Down

0 comments on commit 600a89f

Please sign in to comment.