Merge pull request #144 from lmn/master

Include Support for AIX
chef-boneyard · Mar 27, 2017 · 4246410 · 4246410
2 parents 79d93dc + 8d67743
commit 4246410
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -14,6 +14,7 @@ This cookbook allows you to upgrade the omnibus based Chef install package via C
 - Solaris
 - SLES / openSUSE
 - Windows
+- AIX 
 
 ### Chef
 

diff --git a/metadata.rb b/metadata.rb
@@ -4,9 +4,9 @@
 license          'Apache-2.0'
 description      'Chef omnibus package updater and installer'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '3.0.2'
+version          '3.0.3'
 
-%w(amazon centos debian mac_os_x opensuse opensuseleap oracle redhat scientific solaris suse ubuntu windows).each do |os|
+%w(amazon centos debian mac_os_x opensuse opensuseleap oracle redhat scientific solaris suse ubuntu windows aix).each do |os|
   supports os
 end
 

diff --git a/recipes/default.rb b/recipes/default.rb
@@ -19,7 +19,7 @@
 
 # fail hard if we're on an unsupported platform
 # feel free to open PRs to add additional platforms
-unless platform_family?('debian', 'fedora', 'mac_os_x', 'rhel', 'solaris2', 'windows', 'suse')
+unless platform_family?('debian', 'fedora', 'mac_os_x', 'rhel', 'solaris2', 'windows', 'suse', 'aix')
   Chef::Application.fatal! "Omnibus updater does not support the #{node['platform']} platform"
 end
 

diff --git a/recipes/installer.rb b/recipes/installer.rb
@@ -102,6 +102,8 @@
           cd / && /usr/sbin/installer -pkg `find "/Volumes/chef_software" -name \*.pkg` -target /
           hdiutil detach "/Volumes/chef_software"
         EOF
+    when '.bff'
+      command "install_all_updates -cY -d #{File.join(node['omnibus_updater']['cache_dir'], File.basename(remote_path))} chef"
     else
       raise "Unknown package type encountered for install: #{File.extname(remote_path)}"
     end

diff --git a/recipes/old_package_cleaner.rb b/recipes/old_package_cleaner.rb
@@ -20,7 +20,7 @@
 old_pkgs =
   if ::File.exist?(node['omnibus_updater']['cache_dir'])
     Dir.glob(File.join(node['omnibus_updater']['cache_dir'], 'chef*')).find_all do |file|
-      !file.include?(node['omnibus_updater']['version'].to_s) && !file.scan(/\.(rpm|deb|msi|dmg)$/).empty?
+      !file.include?(node['omnibus_updater']['version'].to_s) && !file.scan(/\.(rpm|deb|msi|dmg|bff)$/).empty?
     end
   else
     []
-Original file line number
+Diff line change
@@ Expand Up @@
     - Solaris
     - SLES / openSUSE
     - Windows
+    - AIX
     ### Chef
@@ Expand Down @@