Merge pull request #14 from redguide/mdxp-source-install-fixes

Mdxp source install fixes

attributes/default.rb

@@ -26,7 +26,7 @@ end
 
 default['nodejs']['version'] = '0.10.26'
 
-default['nodejs']['prefix_url'] = ::URI.join('http://nodejs.org/dist', "v#{node['nodejs']['version']}").to_s
+default['nodejs']['prefix_url'] = ::URI.join('http://nodejs.org/dist/', "v#{node['nodejs']['version']}/").to_s
 
 default['nodejs']['install_repo'] = true
 
@@ -37,3 +37,5 @@ default['nodejs']['binary']['url'] = nil # Auto generated
 default['nodejs']['binary']['checksum']['linux_x64'] = '305bf2983c65edea6dd2c9f3669b956251af03523d31cf0a0471504fd5920aac'
 default['nodejs']['binary']['checksum']['linux_x86'] = '8fa2d952556c8b5aa37c077e2735c972c522510facaa4df76d4244be88f4dc0f'
 default['nodejs']['binary']['checksum']['linux_arm-pi'] = '561ec2ebfe963be8d6129f82a7d1bc112fb8fbfc0a1323ebe38ef55850f25517'
+
+default['nodejs']['make_threads'] = node['cpu'] ? node['cpu']['total'].to_i : 2

recipes/nodejs_from_binary.rb

@@ -33,12 +33,13 @@ if node['nodejs']['binary']['url']
   checksum = node['nodejs']['binary']['checksum']
 else
   nodejs_bin_url = ::URI.join(node['nodejs']['prefix_url'], filename).to_s
-  checksum = node['nodejs']['binary']['checksums']["linux_#{arch}"]
+  checksum = node['nodejs']['binary']['checksum']["linux_#{arch}"]
 end
 
 ark 'nodejs-binary' do
   url nodejs_bin_url
   version node['nodejs']['version']
   checksum checksum
+  has_binaries ['bin/node', 'bin/npm']
   action :install
 end

recipes/nodejs_from_source.rb

@@ -35,5 +35,6 @@ ark 'nodejs-source' do
   url nodejs_src_url
   version node['nodejs']['version']
   checksum node['nodejs']['source']['checksum']
+  make_opts ["-j #{node['nodejs']['make_threads']}"]
   action :install_with_make
 end