Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Revert "Merge pull request #22 from tk0miya/cooperate-with-rvm-capist…

…rano"

This reverts commit ffdfc12, reversing
changes made to 9fcd6d6.
  • Loading branch information...
commit b954f11b0fb7be57e1f7293351106865ec03c09a 1 parent 22a0123
@Arie Arie authored
Showing with 3 additions and 15 deletions.
  1. +3 −15 lib/roundsman/capistrano.rb
View
18 lib/roundsman/capistrano.rb
@@ -196,27 +196,15 @@ def ensure_supported_distro
desc "Installs chef"
task :install, :except => { :no_release => true } do
- if rvm_type == :user
- run "gem uninstall -xaI chef || true"
- run "gem install chef -v #{fetch(:chef_version).inspect} --quiet --no-ri --no-rdoc"
- run "gem install ruby-shadow --quiet --no-ri --no-rdoc"
- else
- sudo "gem uninstall -xaI chef || true"
- sudo "gem install chef -v #{fetch(:chef_version).inspect} --quiet --no-ri --no-rdoc"
- sudo "gem install ruby-shadow --quiet --no-ri --no-rdoc"
- end
+ sudo "gem uninstall -xaI chef || true"
+ sudo "gem install chef -v #{fetch(:chef_version).inspect} --quiet --no-ri --no-rdoc"
+ sudo "gem install ruby-shadow --quiet --no-ri --no-rdoc"
end
desc "Runs the existing chef configuration"
task :chef_solo, :except => { :no_release => true } do
logger.info "Now running #{fetch(:run_list).join(', ')}"
- if rvm_type == :user
- old_sudo = self[:sudo]
- self[:sudo] = "rvmsudo_secure_path=1 #{File.join(rvm_bin_path, "rvmsudo")}"
- end
-
sudo "chef-solo -c #{roundsman_working_dir("solo.rb")} -j #{roundsman_working_dir("solo.json")}#{' -l debug' if fetch(:debug_chef)}"
- self[:sudo] = old_sudo
end
def ensure_cookbooks_exists
Please sign in to comment.
Something went wrong with that request. Please try again.