lib/java/java.rb in buildr-1.1.0 vs lib/java/java.rb in buildr-1.1.1

- old
+ new

@@ -90,13 +90,12 @@ end # :call-seq: # home() => path # - # Returns JAVA_HOME, fails if JAVA_HOME not set. Returns nil for OS/X, we just assume Java is in the path. + # Returns JAVA_HOME, fails if JAVA_HOME not set. def home() - return nil if darwin? @home ||= ENV["JAVA_HOME"] or fail "Are we forgetting something? JAVA_HOME not set." end # :call-seq: # java(class, *args, options?) @@ -319,12 +318,11 @@ # :call-seq: # path_to_bin(cmd?) => path # # Returns the path to the specified Java command (with no argument to java itself). - # Uses JAVA_HOME if set, otherwise assumes the command is accessible from the path. def path_to_bin(name = "java") - home ? File.join(home, "bin", name) : File.join("bin", name) + File.join(home, "bin", name) end protected # :call-seq: