Fix java_home for rhel and fedora

sous-chefs · Jan 16, 2014 · 71dadbd · 71dadbd
1 parent 9c38af2
commit 71dadbd
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/recipes/default.rb b/recipes/default.rb
@@ -23,7 +23,12 @@
 # force_default or higher precedence.
 case node['platform_family']
 when "rhel", "fedora"
-  node.default['java']['java_home'] = "/usr/lib/jvm/java"
+  case node['java']['install_flavor']
+  when "oracle"
+    node.default['java']['java_home'] = "/usr/lib/jvm/java"
+  else
+    node.default['java']['java_home'] = "/usr/lib/jvm/java-1.#{node['java']['jdk_version']}.0"
+  end
   node.default['java']['openjdk_packages'] = ["java-1.#{node['java']['jdk_version']}.0-openjdk", "java-1.#{node['java']['jdk_version']}.0-openjdk-devel"]
 when "freebsd"
   node.default['java']['java_home'] = "/usr/local/openjdk#{node['java']['jdk_version']}"