Skip to content

Commit ddc2a9c

Browse files
author
jtimberman
committed
regression: freebsd (and arch) support was dropped in java cookbook
1 parent a76cb9c commit ddc2a9c

2 files changed

Lines changed: 9 additions & 6 deletions

File tree

metadata.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
recipe "java::oracle_i386", "Installs the 32-bit jvm without setting it as the default"
1212

1313

14-
%w{ debian ubuntu centos redhat fedora }.each do |os|
14+
%w{ debian ubuntu centos redhat fedora arch freebsd }.each do |os|
1515
supports os
1616
end

recipes/openjdk.rb

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,14 @@
2323
jdk_home = ""
2424

2525
pkgs = value_for_platform(
26-
["centos","redhat","fedora"] => {
27-
"default" => ["java-1.#{version}.0-openjdk","java-1.#{version}.0-openjdk-devel"]
28-
},
29-
"default" => ["openjdk-#{version}-jdk"]
30-
)
26+
["centos","redhat","fedora"] => {
27+
"default" => ["java-1.#{version}.0-openjdk","java-1.#{version}.0-openjdk-devel"]
28+
},
29+
["arch","freebsd"] => {
30+
"default" => ["openjdk#{version}"]
31+
},
32+
"default" => ["openjdk-#{version}-jdk"]
33+
)
3134

3235
# done by special request for rberger
3336
ruby_block "set-env-java-home" do

0 commit comments

Comments
 (0)