From b3dc0f12b09bd537cfa8af076cff706d09e45e69 Mon Sep 17 00:00:00 2001 From: Taylor Monacelli Date: Sun, 21 Aug 2016 08:33:31 -0700 Subject: [PATCH] Workaround for 7zip on windows Same as https://github.com/chef-cookbooks/ark/issues/157 --- attributes/default.rb | 3 +-- metadata.rb | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index a1ea7808..87cf7c24 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -22,8 +22,7 @@ default['ark']['prefix_home'] = '/usr/local' default['ark']['tar'] = case node['platform_family'] when 'windows' - "\"#{::Win32::Registry::HKEY_LOCAL_MACHINE.open( - 'SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\7zFM.exe', ::Win32::Registry::KEY_READ).read_s('Path')}\\7z.exe\"" + '"C:\\Program Files\\7-Zip\\7z.exe"' when 'mac_os_x', 'freebsd' '/usr/bin/tar' when 'smartos' diff --git a/metadata.rb b/metadata.rb index 534ee07d..4c4ebd0c 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ license 'Apache 2.0' description 'Provides a custom resource for installing runtime artifacts in a predictable fashion' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '1.2.0' +version '1.2.1' recipe 'ark::default', 'Installs packages needed by the custom resource'