Added passing of autolibs script flags

ballistiq · Mar 30, 2013 · e5acdeb · e5acdeb
1 parent 3c93b38
commit e5acdeb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -49,6 +49,7 @@
 default['rvm']['branch']  = "stable"
 default['rvm']['version'] = "head"
 default['rvm']['upgrade'] = "none"
+default['rvm']['autolibs'] = "enabled"
 
 # extra system-wide tunables
 default['rvm']['root_path']     = "/usr/local/rvm"

diff --git a/recipes/system_install.rb b/recipes/system_install.rb
@@ -19,7 +19,7 @@
 
 include_recipe 'rvm'
 
-script_flags      = build_script_flags(node['rvm']['branch'], node['rvm']['version'])
+script_flags      = build_script_flags(node['rvm']['branch'], node['rvm']['version'], node['rvm']['autolibs'])
 upgrade_strategy  = build_upgrade_strategy(node['rvm']['upgrade'])
 installer_url     = node['rvm']['installer_url']
 rvm_prefix        = ::File.dirname(node['rvm']['root_path'])

diff --git a/recipes/user_install.rb b/recipes/user_install.rb
@@ -24,8 +24,9 @@
 Array(node['rvm']['user_installs']).each do |rvm_user|
   version = rvm_user['version'] || node['rvm']['version']
   branch  = rvm_user['branch'] || node['rvm']['branch']
+  autolibs = rvm_user['autolibs'] || node['rvm']['autolibs']
 
-  script_flags      = build_script_flags(branch, version)
+  script_flags      = build_script_flags(branch, version, autolibs)
   upgrade_strategy  = build_upgrade_strategy(rvm_user['upgrade'])
   installer_url     = rvm_user['installer_url'] || node['rvm']['installer_url']
   rvm_prefix        = rvm_user['home'] ||