Normalize JAVA_HOME

6 files changed, 7 insertions, 6 deletions

diff --git a/Library/Formula/aws-iam-tools.rb b/Library/Formula/aws-iam-tools.rb
index 8af592ea3..06ad76ba5 100644
--- a/Library/Formula/aws-iam-tools.rb
+++ b/Library/Formula/aws-iam-tools.rb
@@ -36,7 +36,8 @@ class AwsIamTools < AmazonWebServicesFormula
       To export the needed variables, add them to your dotfiles.
         * On Bash, add them to `~/.bash_profile`.
         * On Zsh, add them to `~/.zprofile` instead.
-      export JAVA_HOME="/Library/Java/Home/"
+
+      export JAVA_HOME="$(/usr/libexec/java_home)"
       export AWS_IAM_HOME="#{prefix}/jars"
       export AWS_CREDENTIAL_FILE=$HOME/.aws-credentials-master
     EOS
diff --git a/Library/Formula/ec2-api-tools.rb b/Library/Formula/ec2-api-tools.rb
index 59f1c11a7..d179ae5c6 100644
--- a/Library/Formula/ec2-api-tools.rb
+++ b/Library/Formula/ec2-api-tools.rb
@@ -31,7 +31,7 @@ class AmazonWebServicesFormula < Formula
        * On Bash, add them to `~/.bash_profile`.
        * On Zsh, add them to `~/.zprofile` instead.
 
-      export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Home"
+      export JAVA_HOME="$(/usr/libexec/java_home)"
       export EC2_PRIVATE_KEY="$(/bin/ls $HOME/.ec2/pk-*.pem)"
       export EC2_CERT="$(/bin/ls $HOME/.ec2/cert-*.pem)"
       export #{var_name}="#{var_value}"
diff --git a/Library/Formula/hadoop.rb b/Library/Formula/hadoop.rb
index c76aaedc2..261e8c327 100644
--- a/Library/Formula/hadoop.rb
+++ b/Library/Formula/hadoop.rb
@@ -24,7 +24,7 @@ class Hadoop < Formula
 
     inreplace "#{libexec}/conf/hadoop-env.sh",
       "# export JAVA_HOME=/usr/lib/j2sdk1.6-sun",
-      "export JAVA_HOME=$(/usr/libexec/java_home)"
+      "export JAVA_HOME=\"$(/usr/libexec/java_home)\""
   end
 
   def caveats; <<-EOS.undent
diff --git a/Library/Formula/hbase.rb b/Library/Formula/hbase.rb
index 77f0187d4..81808f1aa 100644
--- a/Library/Formula/hbase.rb
+++ b/Library/Formula/hbase.rb
@@ -26,7 +26,7 @@ class Hbase < Formula
 
     inreplace "#{libexec}/conf/hbase-env.sh",
       "# export JAVA_HOME=/usr/java/jdk1.6.0/",
-      "export JAVA_HOME=$(/usr/libexec/java_home)"
+      "export JAVA_HOME=\"$(/usr/libexec/java_home)\""
   end
 
   def caveats; <<-EOS.undent
diff --git a/Library/Formula/hive.rb b/Library/Formula/hive.rb
index f72b28fdf..59822a9ef 100644
--- a/Library/Formula/hive.rb
+++ b/Library/Formula/hive.rb
@@ -32,7 +32,7 @@ class Hive < Formula
       export HIVE_HOME=#{libexec}
 
     You may need to set JAVA_HOME:
-      export JAVA_HOME=$(/usr/libexec/java_home)
+      export JAVA_HOME="$(/usr/libexec/java_home)"
     EOS
   end
 end
diff --git a/Library/Formula/pig.rb b/Library/Formula/pig.rb
index c07dde27a..72ac6e998 100644
--- a/Library/Formula/pig.rb
+++ b/Library/Formula/pig.rb
@@ -16,7 +16,7 @@ class Pig < Formula
 
   def caveats; <<-EOS.undent
     You may need to set JAVA_HOME:
-      export JAVA_HOME=$(/usr/libexec/java_home)
+      export JAVA_HOME="$(/usr/libexec/java_home)"
     EOS
   end
 end