Created
January 24, 2010 10:20
-
-
Save anonymous/285128 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/scripts/manage b/scripts/manage | |
index 13063ba..307fa1d 100755 | |
--- a/scripts/manage | |
+++ b/scripts/manage | |
@@ -708,18 +708,23 @@ __rvm_fetch_ruby() { | |
fi | |
fi | |
else | |
- if [[ ! -z "$rvm_head_flag" ]] || [[ "trunk" = "$rvm_ruby_revision" ]] ; then | |
- rvm_url="${rvm_url:-"$rvm_ruby_repo_url/trunk"}" | |
- rvm_rev="" | |
- elif [[ ! -z "$rvm_ruby_tag" ]] ; then | |
+ if [[ ! -z "$rvm_ruby_tag" ]] ; then | |
# TODO: Check if tag v is valid | |
rvm_url="${rvm_url:-"$rvm_ruby_repo_url/tags/$(echo $rvm_ruby_tag | sed 's/^t//')"}" | |
- rvm_rev="" | |
- elif [[ "$rvm_major_version.$rvm_minor_version" = "8.8" ]] ; then | |
+ elif [[ "$rvm_major_version" = "9" ]] ; then | |
+ if [[ -z "$rvm_minor_version" ]] || [[ "$rvm_minor_version" = 2 ]] ; then | |
+ rvm_url="${rvm_url:-"$rvm_ruby_repo_url/trunk"}" | |
+ else | |
+ rvm_url="${rvm_url:-"$rvm_ruby_repo_url/branches/ruby_1_${rvm_major_version}_${rvm_minor_version}"}" | |
+ fi | |
+ elif [[ -z "$rvm_minor_version" ]] || [[ "$rvm_major_version.$rvm_minor_version" = "8.8" ]] ; then | |
rvm_url="${rvm_url:-"$rvm_ruby_repo_url/branches/ruby_1_${rvm_major_version}"}" | |
- rvm_rev="-$rvm_ruby_revision" | |
else | |
rvm_url="${rvm_url:-"$rvm_ruby_repo_url/branches/ruby_1_${rvm_major_version}_${rvm_minor_version}"}" | |
+ fi | |
+ | |
+ rvm_rev="" | |
+ if [ ! -z "$rvm_ruby_revision" ] ; then | |
rvm_rev="-$rvm_ruby_revision" | |
fi | |
diff --git a/scripts/selector b/scripts/selector | |
index ffd038f..e7080b2 100755 | |
--- a/scripts/selector | |
+++ b/scripts/selector | |
@@ -385,8 +385,6 @@ __rvm_ruby_string() { | |
elif $rvm_scripts_path/match "$string" "^rc[0-9]" ; then | |
rvm_ruby_patch_level="$string" | |
elif $rvm_scripts_path/match "$string" "^[0-9]\.[0-9]" ; then | |
- if [[ "1.8" = "$string" ]] ; then string="1.8.6" ; fi | |
- if [[ "1.9" = "$string" ]] ; then string="1.9.1" ; fi | |
rvm_ruby_version="$string" | |
unset rvm_ruby_revision rvm_ruby_tag | |
elif $rvm_scripts_path/match "$string" "^p[0-9]" ; then |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment