svn commit: r964960 - /buildr/trunk/lib/buildr/java/commands.rb

[to...@apache.org]

Author: toulmean
Date: Fri Jul 16 21:42:20 2010
New Revision: 964960

URL: http://svn.apache.org/viewvc?rev=964960&view=rev
Log:
path_to_bin should use normalize_path

Modified:
    buildr/trunk/lib/buildr/java/commands.rb

Modified: buildr/trunk/lib/buildr/java/commands.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/java/commands.rb?rev=964960&r1=964959&r2=964960&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/java/commands.rb (original)
+++ buildr/trunk/lib/buildr/java/commands.rb Fri Jul 16 21:42:20 2010
@@ -199,9 +199,9 @@ module Java
       # Returns the path to the specified Java command (with no argument to java itself).
       def path_to_bin(name = nil)
         home = ENV['JAVA_HOME'] or fail 'Are we forgetting something? JAVA_HOME not set.'
-        bin = File.expand_path(File.join(home, 'bin'))
+        bin = File.normalize_path(File.join(home, 'bin'))
         fail 'JAVA_HOME environment variable does not point to a valid JRE/JDK installation.' unless File.exist? bin
-        File.expand_path(File.join(bin, name.to_s))
+        File.normalize_path(File.join(bin, name.to_s))
       end
 
       # :call-seq: