From 48a55548d414500f8d6c26dfbde5a694cc03fbf2 Mon Sep 17 00:00:00 2001 From: Xu Cheng Date: Sat, 28 Feb 2015 02:17:32 +0800 Subject: redpen datomic: use Language::Java.java_home_env Closes #37247. Signed-off-by: Xu Cheng --- Library/Formula/datomic.rb | 4 ++-- Library/Formula/redpen.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'Library/Formula') diff --git a/Library/Formula/datomic.rb b/Library/Formula/datomic.rb index 44abb392a..4f1cc58a1 100644 --- a/Library/Formula/datomic.rb +++ b/Library/Formula/datomic.rb @@ -8,9 +8,9 @@ class Datomic < Formula def install libexec.install Dir["*"] - (bin/"datomic").write_env_script libexec/"bin/datomic", :JAVA_HOME => ENV["JAVA_HOME"] + (bin/"datomic").write_env_script libexec/"bin/datomic", Language::Java.java_home_env %w[transactor repl repl-jline rest shell].each do |file| - (bin/"datomic-#{file}").write_env_script libexec/"bin/#{file}", :JAVA_HOME => ENV["JAVA_HOME"] + (bin/"datomic-#{file}").write_env_script libexec/"bin/#{file}", Language::Java.java_home_env end end diff --git a/Library/Formula/redpen.rb b/Library/Formula/redpen.rb index 5b2997823..52507f9be 100644 --- a/Library/Formula/redpen.rb +++ b/Library/Formula/redpen.rb @@ -11,7 +11,7 @@ class Redpen < Formula libexec.install %w[conf lib sample-doc] prefix.install "bin" - bin.env_script_all_files(libexec/"bin", :JAVA_HOME => ENV["JAVA_HOME"]) + bin.env_script_all_files(libexec/"bin", Language::Java.java_home_env("1.8")) end test do -- cgit v1.2.3