Permalink
Browse files

Make zeromq cookbook 32 and 64 bit compatible

  • Loading branch information...
1 parent 4c97cae commit 98de02c7b8590657c95dc17bb88043e637851172 @michaelklishin michaelklishin committed Aug 20, 2012
Showing with 8 additions and 5 deletions.
  1. +7 −3 ci_environment/zeromq/attributes/default.rb
  2. +1 −2 ci_environment/zeromq/recipes/default.rb
@@ -1,3 +1,7 @@
-default[:zeromq][:package][:url] = "http://files.travis-ci.org/packages/deb/zeromq/zeromq_2.1.10+fpm0_i386.deb"
-default[:zeromq][:package][:user] = node.travis_build_environment.user
-default[:zeromq][:package][:group] = node.travis_build_environment.group
+default[:zeromq] = {
+ :package => {
+ :url => "http://files.travis-ci.org/packages/deb/zeromq/zeromq_2.1.10+fpm0_#{node.travis_build_environment.arch}.deb",
+ :user => node.travis_build_environment.user,
+ :group => node.travis_build_environment.group
+ }
+}
@@ -26,8 +26,7 @@
action :install
end
- # this assumes 32-bit base box.
- ["zeromq_2.1.10+fpm0_i386.deb"].each do |deb|
+ ["zeromq_2.1.10+fpm0_#{node.travis_build_environment.arch}.deb"].each do |deb|
path = File.join(tmp, deb)
remote_file(path) do

0 comments on commit 98de02c

Please sign in to comment.