[COOK-858] - fix regex to find arch on centos6, too

jtimberman · jtimberman · commit 3fadd9ef131e · 2012-02-13T22:23:37.000-07:00
diff --git a/README.md b/README.md
@@ -124,14 +124,14 @@ By default, the extracted directory is extracted to app_root/extracted_dir_name
         bin_cmds ["mvn"]
         action :install
     end
-    
-    
+
+
 
 ---
 Usage
 =====
 
-Simply include the `java` recipe where ever you would like Java installed.  
+Simply include the `java` recipe where ever you would like Java installed.
 
 To install Oracle flavored Java on Debian or Ubuntu override the `node['java']['install_flavor']` attribute with in role:
 
diff --git a/recipes/openjdk.rb b/recipes/openjdk.rb
@@ -53,7 +53,7 @@
       require "fileutils"
       arch = node['kernel']['machine'] =~ /x86_64/ ? "x86_64" : "i386"
       Chef::Log.debug("glob is #{java_home_parent}/java*#{version}*openjdk*")
-      jdk_home = Dir.glob("#{java_home_parent}/java*#{version}*openjdk{,-#{arch}}")[0]
+      jdk_home = Dir.glob("#{java_home_parent}/java*#{version}*openjdk{,[-\.]#{arch}}")[0]
       Chef::Log.debug("jdk_home is #{jdk_home}")
       # delete the symlink if it already exists
       if File.exists? java_home
