Author: lacton
Date: Sat Sep 13 12:12:32 2008
New Revision: 695007
URL: http://svn.apache.org/viewvc?rev=695007&view=rev
Log:
Small refactoring to reduce code duplication
Modified:
incubator/buildr/trunk/lib/buildr/java/java.rb
Modified: incubator/buildr/trunk/lib/buildr/java/java.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/buildr/java/java.rb?rev=695007&r1=695006&r2=695007&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/buildr/java/java.rb (original)
+++ incubator/buildr/trunk/lib/buildr/java/java.rb Sat Sep 13 12:12:32 2008
@@ -59,9 +59,10 @@
# but maybe the JRE. Return nil if not found.
# If given a block, it yields the path to tools.jar, if tools.jar was
found.
def tools_jar
- tools_jar = [File.expand_path('lib/tools.jar', ENV['JAVA_HOME']),
File.expand_path('../lib/tools.jar', ENV['JAVA_HOME'])].find { |path|
File.exist?(path) }
- yield tools_jar if block_given? && !tools_jar.nil?
- tools_jar
+ location_candidates = ['lib/tools.jar', '../lib/tools.jar']
+ tools_jar_path = location_candidates.map { |path| File.expand_path(path,
ENV['JAVA_HOME']) }.find { |path| File.exist?(path) }
+ yield tools_jar_path if block_given? && !tools_jar_path.nil?
+ tools_jar_path
end
end
end
