Permalink
Browse files

find_cmd should return the full path of the db command

[#1488 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
  • Loading branch information...
1 parent 9a42096 commit 9284bcc35a6431a6044da2b608998b83e4fb1f9b @kamal kamal committed with jeremy Aug 10, 2009
Showing with 8 additions and 4 deletions.
  1. +8 −4 railties/lib/commands/dbconsole.rb
@@ -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"]

0 comments on commit 9284bcc

Please sign in to comment.