From 23ee82c9eb81528c78a6f91d0621ed9bffed6e4c Mon Sep 17 00:00:00 2001 From: Xu Cheng Date: Tue, 24 Feb 2015 16:26:21 +0800 Subject: datomic: set JAVA_HOME by :java and using write_env_script Closes #37141. Signed-off-by: Xu Cheng --- Library/Formula/datomic.rb | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) (limited to 'Library/Formula') diff --git a/Library/Formula/datomic.rb b/Library/Formula/datomic.rb index 978955df1..44abb392a 100644 --- a/Library/Formula/datomic.rb +++ b/Library/Formula/datomic.rb @@ -4,27 +4,18 @@ class Datomic < Formula sha256 "3fd1d7a8a2c400f570899e6bb77af246ea7d7561f7692b84f299064b8b22b681" version "0.9.5130" - def write_libexec_alias(*script_names) - base = "datomic" - script_names.each do |script_name| - alias_name = script_name == base ? base : "#{base}-#{script_name}" - (bin + alias_name).write <<-EOS.undent - #!/bin/bash - cd #{libexec} && exec "bin/#{script_name}" "$@" - EOS - end - end + depends_on :java def install libexec.install Dir["*"] - binaries = %w[datomic transactor repl repl-jline rest shell] - write_libexec_alias(*binaries) + (bin/"datomic").write_env_script libexec/"bin/datomic", :JAVA_HOME => ENV["JAVA_HOME"] + %w[transactor repl repl-jline rest shell].each do |file| + (bin/"datomic-#{file}").write_env_script libexec/"bin/#{file}", :JAVA_HOME => ENV["JAVA_HOME"] + end end def caveats <<-EOS.undent - You may need to set JAVA_HOME: - export JAVA_HOME="$(/usr/libexec/java_home)" All commands have been installed with the prefix "datomic-". We agreed to the Datomic Free Edition License for you: @@ -34,8 +25,6 @@ class Datomic < Formula end test do - ENV["JAVA_HOME"] = `/usr/libexec/java_home`.strip - help = pipe_output("#{bin}/datomic-shell", "Shell.help();\n") assert_match(/^\* Basics/, help) end -- cgit v1.2.3