From 195fdc622dfeda0fcad15b9e9696a3eebd8a8973 Mon Sep 17 00:00:00 2001
From: Jack Nagel
Date: Tue, 20 May 2014 17:10:29 -0500
Subject: Normalize setting JAVA_HOME

---
 Library/Formula/henplus.rb          | 2 +-
 Library/Formula/libreadline-java.rb | 2 +-
 Library/Formula/luciddb.rb          | 5 ++---
 Library/Formula/tomcat-native.rb    | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'Library')

diff --git a/Library/Formula/henplus.rb b/Library/Formula/henplus.rb
index 8cf88af54..b3308d6a6 100644
--- a/Library/Formula/henplus.rb
+++ b/Library/Formula/henplus.rb
@@ -9,7 +9,7 @@ class Henplus < Formula
   depends_on 'libreadline-java'
 
   def install
-    ENV['JAVA_HOME'] = `/usr/libexec/java_home`.chomp!
+    ENV['JAVA_HOME'] = `/usr/libexec/java_home`.chomp
 
     inreplace 'bin/henplus' do |s|
       s.gsub! "LD_LIBRARY_PATH", "DYLD_LIBRARY_PATH"
diff --git a/Library/Formula/libreadline-java.rb b/Library/Formula/libreadline-java.rb
index 48edd2199..1533d9585 100644
--- a/Library/Formula/libreadline-java.rb
+++ b/Library/Formula/libreadline-java.rb
@@ -12,7 +12,7 @@ class LibreadlineJava < Formula
   patch :DATA
 
   def install
-    ENV['JAVA_HOME'] = `/usr/libexec/java_home`.chomp!
+    ENV['JAVA_HOME'] = `/usr/libexec/java_home`.chomp
 
     # Current Oracle JDKs put the jni.h and jni_md.h in a different place than the
     # original Apple/Sun JDK used to.
diff --git a/Library/Formula/luciddb.rb b/Library/Formula/luciddb.rb
index 784e92ecf..5ddcaa7df 100644
--- a/Library/Formula/luciddb.rb
+++ b/Library/Formula/luciddb.rb
@@ -14,12 +14,11 @@ class Luciddb < Formula
   end
 
   def install
-    java_home = `/usr/libexec/java_home`.chomp!
     libexec.install Dir['*']
     cd libexec/'install' do
       # install.sh just sets Java classpaths and writes them to bin/classpath.gen.
       # This is why we run it /after/ copying all the files to #{libexec}.
-      ENV['JAVA_HOME'] = java_home
+      ENV['JAVA_HOME'] = `/usr/libexec/java_home`.chomp
       system "./install.sh"
     end
     Dir["#{libexec}/bin/*"].each do |b|
@@ -43,7 +42,7 @@ class Luciddb < Formula
       <key>EnvironmentVariables</key>
       <dict>
         <key>JAVA_HOME</key>
-        <string>#{`/usr/libexec/java_home`.chomp!}</string>
+        <string>#{`/usr/libexec/java_home`.chomp}</string>
       </dict>
       <key>ProgramArguments</key>
       <array>
diff --git a/Library/Formula/tomcat-native.rb b/Library/Formula/tomcat-native.rb
index 48baca50b..029154fe5 100644
--- a/Library/Formula/tomcat-native.rb
+++ b/Library/Formula/tomcat-native.rb
@@ -13,7 +13,7 @@ class TomcatNative < Formula
     cd "jni/native" do
       system "./configure", "--prefix=#{prefix}",
                             "--with-apr=#{MacOS.sdk_path}/usr",
-                            "--with-java-home=#{`/usr/libexec/java_home`}",
+                            "--with-java-home=#{`/usr/libexec/java_home`.chomp}",
                             "--with-ssl=#{Formula["openssl"].prefix}"
 
       # fixes occasional compiling issue: glibtool: compile: specify a tag with `--tag'
-- 
cgit v1.2.3