summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2016-03-17 19:41:59 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2016-03-17 19:41:59 -0700
commitefd8b68745a73f2ee09eee92b06e0fc5b2c799f0 (patch)
tree725911a998531d3aeebc644de5ffe73ea5fd6474
parent17ca25869fd9e0ce0a4ec013a5dc39549ecaa6f7 (diff)
downloadchef-efd8b68745a73f2ee09eee92b06e0fc5b2c799f0.tar.gz
use rb-readlin on unix as well as windows
necessary for ruby-2.2.4
-rw-r--r--omnibus/config/projects/chef.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb
index 1b6e373725..9281b5318b 100644
--- a/omnibus/config/projects/chef.rb
+++ b/omnibus/config/projects/chef.rb
@@ -34,7 +34,7 @@ else
install_dir "#{default_root}/#{name}"
end
-override :ruby, version: "2.1.8"
+override :ruby, version: "2.2.4"
# Leave dev-kit pinned to 4.5 because 4.7 is 20MB larger and we don't want
# to unnecessarily make the client any fatter.
override :'ruby-windows-devkit', version: "4.5.2-20111229-1559" if windows? && windows_arch_i386?
@@ -51,7 +51,7 @@ if windows? || rhel?
end
dependency "preparation"
-dependency "rb-readline" if windows?
+dependency "rb-readline"
dependency "nokogiri"
dependency "pry"
dependency "chef"