Skip to content

Commit

Permalink
Merge pull request #102 from mpapis/rvm.io
Browse files Browse the repository at this point in the history
Switch to rvm.io and add "rvm get stable"
  • Loading branch information
fnichol committed May 2, 2012
2 parents e23a452 + 7be2d39 commit bafd3ff
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -431,9 +431,10 @@ There are currently 3 valid values:

* `"none"`, `false`, or `nil`: will not update RVM and leave it in its
current state.
* `"stable"`: runs `rvm get stable` which downloads and installs RVM from
branch *"stable"*.
* `"latest"`: runs `rvm get latest` which downloads and installs the latest
*"stable"* RVM release listed by
[https://rvm.beginrescueend.com/releases/stable-version.txt][stable].
tagged version of RVM.
* `"head"`: runs the infamous `rvm get head` which clones (via git) and
installs the latest RVM repository HEAD.

Expand Down Expand Up @@ -1463,15 +1464,14 @@ limitations under the License.
[librarian]: https://github.com/applicationsonline/librarian#readme
[lwrp]: http://wiki.opscode.com/display/chef/Lightweight+Resources+and+Providers+%28LWRP%29
[package_resource]: http://wiki.opscode.com/display/chef/Resources#Resources-Package
[rvm]: http://rvm.beginrescueend.com
[rvm_create_gemset]: http://rvm.beginrescueend.com/gemsets/creating/
[rvm_delete_gemset]: http://rvm.beginrescueend.com/gemsets/deleting/
[rvm_empty_gemset]: http://rvm.beginrescueend.com/gemsets/emptying/
[rvm_default]: http://rvm.beginrescueend.com/rubies/default/
[rvm_gemsets]: http://rvm.beginrescueend.com/gemsets/
[rvm_install]: http://rvm.beginrescueend.com/rubies/installing/
[rvm_remove]: http://rvm.beginrescueend.com/rubies/removing/
[rvm_stable]: https://rvm.beginrescueend.com/releases/stable-version.txt
[rvm]: https://rvm.io
[rvm_create_gemset]: https://rvm.io/gemsets/creating/
[rvm_delete_gemset]: https://rvm.io/gemsets/deleting/
[rvm_empty_gemset]: https://rvm.io/gemsets/emptying/
[rvm_default]: https://rvm.io/rubies/default/
[rvm_gemsets]: https://rvm.io/gemsets/
[rvm_install]: https://rvm.io/rubies/installing/
[rvm_remove]: https://rvm.io/rubies/removing/
[script_resource]: http://wiki.opscode.com/display/chef/Resources#Resources-Script
[vagrant]: http://vagrantup.com

Expand Down
2 changes: 1 addition & 1 deletion libraries/chef_rvm_recipe_helpers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def upgrade_rvm(opts = {})
action :run
end

only_if { %w{ latest head }.include?(opts[:upgrade_strategy]) }
only_if { %w{ stable latest head }.include?(opts[:upgrade_strategy]) }
end
u.run_action(:run) if install_now
end
Expand Down

0 comments on commit bafd3ff

Please # to comment.