Skip to content

Fix use_*(_rubies) attribute calls in chruby.sh #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix use_*(_rubies) attribute calls in chruby.sh #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions metadata.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
maintainer_email "[email protected]"
license "Apache 2.0"
description "Installs/Configures chruby"
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
long_description IO.read(File.join(File.dirname(__FILE__), "README.md"))
version "0.2.1"
depends "ark"
depends "ruby_build"
supports "centos"
supports "ubuntu"

depends "ark"
depends "ruby_build"
supports "centos"
supports "ubuntu"
2 changes: 1 addition & 1 deletion recipes/system.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
if flag
ruby_build_ruby ruby do
prefix_path "/opt/rubies/#{ruby}"
end
end
end
end

Expand Down
5 changes: 2 additions & 3 deletions templates/default/chruby.sh.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ source /usr/local/chruby/share/chruby/chruby.sh
RUBIES+=(/opt/chef/embedded)
<% end -%>

<% if node['chruby']['use_rvm'] && ! Dir["~/.rubies/*"].empty? -%>
<% if node['chruby']['use_rvm_rubies'] && ! Dir["~/.rubies/*"].empty? -%>
RUBIES+=($HOME/.rvm/rubies/*)
<% end -%>

<% if node['chruby']['use_rbenv'] && ! Dir["~/.rbenv/versions/*"].empty? -%>
<% if node['chruby']['use_rbenv_rubies'] && ! Dir["~/.rbenv/versions/*"].empty? -%>
RUBIES+=($HOME/.rbenv/rubies/*)
<% end -%>

Expand All @@ -23,4 +23,3 @@ chruby <%= node['chruby']['default'] %>
<% end -%>

<%= node['chruby']['auto_switch'] && "source /usr/local/chruby/share/chruby/auto.sh" %>