make attributes more wrapper friendly

coderclear · Feb 1, 2016 · 473cfe0 · 473cfe0
1 parent 917ed4c
commit 473cfe0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -3,7 +3,7 @@
 # Cookbook Name:: git
 # Attributes:: default
 #
-# Copyright 2008-2015, Chef Software, Inc.
+# Copyright 2008-2016, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 when 'windows'
   default['git']['version'] = '2.5.1'
   default['git']['architecture'] = '32'
-  default['git']['url'] = "https://github.com/git-for-windows/git/releases/download/v#{node['git']['version']}.windows.1/Git-#{node['git']['version']}-#{node['git']['architecture']}-bit.exe"
+  default['git']['url'] = 'https://github.com/git-for-windows/git/releases/download/v%{version}.windows.1/Git-%{version}-%{architecture}-bit.exe'
   default['git']['checksum'] = 'f1a6a1b96f2497331afbefda7c720995d7deb0ba55caeb7307bcee27dae8e157'
   default['git']['display_name'] = "Git version #{node['git']['version']}"
 when 'mac_os_x'
@@ -33,7 +33,7 @@
 else
   default['git']['prefix'] = '/usr/local'
   default['git']['version'] = '1.9.5'
-  default['git']['url'] = "https://nodeload.github.com/git/git/tar.gz/v#{node['git']['version']}"
+  default['git']['url'] = 'https://nodeload.github.com/git/git/tar.gz/v%{version}'
   default['git']['checksum'] = '0f30984828d573da01d9f8e78210d5f4c56da1697fd6d278bad4cfa4c22ba271'
   default['git']['use_pcre'] = false
 end

diff --git a/recipes/source.rb b/recipes/source.rb
@@ -21,7 +21,7 @@
   provider Chef::Provider::GitClient::Source
   source_checksum node['git']['checksum']
   source_prefix node['git']['prefix']
-  source_url node['git']['url']
+  source_url format(node['git']['url'], version: node['git']['version'])
   source_use_pcre node['git']['use_pcre']
   source_version node['git']['version']
   action :install

diff --git a/recipes/windows.rb b/recipes/windows.rb
@@ -18,7 +18,7 @@
 
 git_client 'default' do
   windows_display_name node['git']['display_name']
-  windows_package_url node['git']['url']
+  windows_package_url format(node['git']['url'], version: node['git']['version'], architecture: node['git']['architecture'])
   windows_package_checksum node['git']['checksum']
   action :install
 end