Make package install idempotent on Windows

Use correct DisplayName registry value in windows_package resource package_name parameter
sous-chefs · Dec 6, 2012 · 0dfd3ef · 0dfd3ef
1 parent 51f1820
commit 0dfd3ef
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -22,6 +22,7 @@
   default['git']['version'] = "1.8.0-preview20121022"
   default['git']['url'] = "http://github.com/downloads/msysgit/git/Git-#{node['git']['version']}.exe"
   default['git']['checksum'] = "8ec19d04912fd27d7350823c857a4807b550fa63a3744bf6fd2841de8cfa9a0f"
+  default['git']['display_name'] = "Git version #{ node['git']['version'] }"
 when "mac_os_x"
   default['git']['osx_dmg']['app_name']    = "git-1.8.0-intel-universal-snow-leopard"
   default['git']['osx_dmg']['volumes_dir'] = "Git 1.8.0 Snow Leopard Intel Universal"

diff --git a/recipes/default.rb b/recipes/default.rb
@@ -26,11 +26,10 @@
   end
   package "git"
 when "windows"
-  windows_package "git" do
+  windows_package node['git']['display_name'] do
     source node['git']['url']
     checksum node['git']['checksum']
-    action :install
-    not_if { File.exists? 'C:\Program Files (x86)\Git\bin\git.exe' }
+    installer_type :inno
   end
 when "mac_os_x"
   dmg_package "GitOSX-Installer" do