scripts/selector in rvm-0.1.20 vs scripts/selector in rvm-0.1.21
- old
+ new
@@ -102,21 +102,23 @@
;;
ironruby)
unset rvm_ruby_patch_level
if [[ "$rvm_head_flag" -eq 1 ]] ; then
- rvm_ruby_version="head"
- rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
- rvm_ruby_package_name="${rvm_ruby_string}"
- rvm_ruby_repo_url="${rvm_ruby_repo_url:-$(__rvm_db "ironruby_repo_url")}"
- rvm_url="${rvm_ruby_repo_url:-$(__rvm_db "ironruby_repo_url")}"
+ export rvm_ruby_version="head"
+ export rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
+ export rvm_ruby_package_name="${rvm_ruby_string}"
+ export rvm_ruby_repo_url="${rvm_ruby_repo_url:-$(__rvm_db "ironruby_repo_url")}"
+ export rvm_url="${rvm_ruby_repo_url:-$(__rvm_db "ironruby_repo_url")}"
else
- rvm_ruby_version=${rvm_ruby_version:-"$(__rvm_db "ironruby_version")"}
- rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
- rvm_ruby_package_file="${rvm_ruby_string}.zip"
- rvm_ruby_package_name="${rvm_ruby_string}"
- rvm_url="$(__rvm_db "ironruby_url")${rvm_ruby_package_file}"
+ export rvm_archive_extension="tar.gz"
+ export rvm_ruby_version=${rvm_ruby_version:-"$(__rvm_db "ironruby_version")"}
+ export rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
+ sha1=$(curl -s http://github.com/api/v2/yaml/repos/show/ironruby/ironruby/tags | awk '/'${rvm_ruby_version}'/{print $NF}')
+ export rvm_ruby_package_file="ironruby-ironruby-${sha1:0:7}.${rvm_archive_extension}"
+ export rvm_ruby_package_name="ironruby-ironruby-${sha1:0:7}"
+ export rvm_url="$(__rvm_db "ironruby_url")v${rvm_ruby_version}"
fi
;;
ree)
rvm_ruby_interpreter=ree
@@ -192,10 +194,10 @@
if [[ ! -z "$rvm_ruby_version" ]] ; then
rvm_major_version=$(echo $rvm_ruby_version | awk -F'.' '{ print $2 }')
rvm_minor_version=$(echo $rvm_ruby_version | awk -F'.' '{ print $3 }')
fi
- rvm_ruby_package_name="$rvm_ruby_string"
+ rvm_ruby_package_name="${rvm_ruby_package_name:-$rvm_ruby_string}"
rvm_ruby_home="$rvm_rubies_path/$rvm_ruby_string"
rvm_ruby_log_path="$rvm_log_path/$rvm_ruby_string"
rvm_ruby_src_path="$rvm_src_path/$rvm_ruby_string"
rvm_ruby_binary="$rvm_ruby_home/bin/ruby"
rvm_ruby_irbrc="$rvm_ruby_home/.irbrc"