scripts/manage in rvm-0.1.2 vs scripts/manage in rvm-0.1.3
- old
+ new
@@ -706,21 +706,28 @@
result=$? ; if [[ "$result" -gt 0 ]] ; then
$rvm_scripts_path/log "error" "There has been an error while trying to fetch the repository. Aborting the installation." ; __rvm_pushpop ; return $result
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 [[ -z "$rvm_ruby_version" ]] && [[ ! -z "$rvm_head_flag" ]] ; then
+ rvm_url="${rvm_url:-"$rvm_ruby_repo_url/trunk"}"
+ 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
if [[ -d "$rvm_ruby_src_path/.svn" ]] ; then
builtin cd $rvm_ruby_src_path