scripts/ruby-installer in rvm-0.0.84 vs scripts/ruby-installer in rvm-0.0.85

- old
+ new

@@ -129,17 +129,17 @@ macruby_path="/usr/local/bin" # TODO: configure & make variables should be set here. rvm_ruby_configure=" true " rvm_ruby_make="rake" rvm_ruby_make_install="sudo rake install" - rvm_url="$($rvm_scripts_path/db "$rvm_config_path/db" "${rvm_ruby_interpreter}_repo_url")" + __rvm_db "${rvm_ruby_interpreter}_repo_url" "rvm_url" rvm_ruby_repo_url=$rvm_url __rvm_install_source $* else # if [[ "nightly" = "$rvm_ruby_version" ]] ; then macruby_path="/usr/local/bin" # TODO: Separated nightly from head. - rvm_url="$($rvm_scripts_path/db "$rvm_config_path/db" "macruby_nightly_url")" + __rvm_db "macruby_nightly_url" "rvm_url" $rvm_scripts_path/log "info" "Retrieving the latest nightly macruby build..." $rvm_scripts_path/fetch "$rvm_url" result=$? ; if [[ "$result" -gt 0 ]] ; then return $result ; fi mv "$rvm_archives_path/macruby_nightly-latest.pkg" "$rvm_archives_path/macruby_nightly.pkg" __rvm_run "macruby/extract" "sudo installer -pkg '$rvm_path/archives/macruby_nightly.pkg' -target '/'" @@ -174,11 +174,11 @@ fi ;; ree) if [[ ! -z "$(echo $rvm_ruby_version | awk '/^1\.8/')" ]] && [[ -z "$rvm_head_flag" ]] ; then - rvm_url="$($rvm_scripts_path/db "$rvm_config_path/db" "ree_${rvm_ruby_version}_url")/$rvm_ruby_package_file.tar.gz" + rvm_url="$(__rvm_db "ree_${rvm_ruby_version}_url")/$rvm_ruby_package_file.tar.gz" $rvm_scripts_path/log "info" "Installing Ruby Enterprise Edition from source to: $rvm_ruby_home" __rvm_pushpop "$rvm_src_path" if [[ -z "$rvm_force_flag" ]] && [[ -d "$rvm_ruby_src_path" ]] && [[ ! -x "$rvm_ruby_src_path/installer" ]] ; then $rvm_scripts_path/log "It appears that the archive has already been extracted. Skipping extract (use --force to force re-download and extract)." else @@ -217,10 +217,10 @@ __rvm_irbrc __rvm_bin_scripts __rvm_post_install __rvm_pushpop else - rvm_url="$($rvm_scripts_path/db "$rvm_config_path/db" "ree_${rvm_ruby_version}_repo_url")" + __rvm_db "ree_${rvm_ruby_version}_repo_url" "rvm_url" if [[ -z "$rvm_url" ]] ; then $rvm_scripts_path/log "fail" "rvm does not know the rvm repo url for 'ree_${rvm_ruby_version}'" result=1 else rvm_ruby_repo_url=$rvm_url