scripts/selector in rvm-0.1.3 vs scripts/selector in rvm-0.1.5
- old
+ new
@@ -28,13 +28,13 @@
rvm_ruby_string="${rvm_ruby_interpreter}-${rvm_ruby_version}"
rvm_ruby_package_name="${rvm_ruby_interpreter}_nightly-${rvm_ruby_version}"
rvm_ruby_package_file="$rvm_ruby_package_name"
else
__rvm_db "macruby_version" "rvm_ruby_version"
- rvm_ruby_package_name="MacRuby%200.5%20beta%201.zip"
+ rvm_ruby_package_name="MacRuby%200.5.zip"
rvm_ruby_package_file="$rvm_ruby_package_name"
- rvm_url="http://www.macruby.org/files/MacRuby%200.5%20beta%201.zip"
+ rvm_url="http://www.macruby.org/files/$rvm_ruby_package_name"
fi
unset rvm_ruby_patch_level
else
$rvm_scripts_path/log "fail" "MacRuby can only be installed on a Darwin OS."
@@ -223,12 +223,12 @@
if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
if [[ -z "$rvm_ruby_interpreter" ]] ; then rvm_ruby_interpreter="default" ; fi
if [[ "default" = "$rvm_ruby_interpreter" ]] ; then
- new_path=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
- new_path=$rvm_bin_path:$new_path
+ new_path="$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)"
+ new_path="$rvm_bin_path:$new_path"
if [[ -s $rvm_config_path/default ]] ; then
unset new_path
source $rvm_config_path/default
if [[ ! -z "$rvm_verbose_flag" ]] ; then
@@ -242,12 +242,12 @@
fi
elif [[ "system" = "$rvm_ruby_interpreter" ]] ; then
unset GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
- new_path=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
- new_path=$rvm_bin_path:$new_path
+ new_path="$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)"
+ new_path="$rvm_bin_path:$new_path"
if [[ -s $rvm_config_path/system ]] ; then
grep "MY_RUBY_HOME='$rvm_rubies_path" "$rvm_config_path/system" > /dev/null
if [[ $? -eq 0 ]] ; then
rm -f $rvm_config_path/system # 'system' should *not* point to an rvm ruby.
else
@@ -266,14 +266,14 @@
fi
export rvm_ruby_string="system"
else
- GEM_HOME=$rvm_ruby_gem_home
- GEM_PATH=$rvm_ruby_gem_home
- MY_RUBY_HOME=$rvm_ruby_home
- RUBY_VERSION=$rvm_ruby_string
+ GEM_HOME="$rvm_ruby_gem_home"
+ GEM_PATH="$rvm_ruby_gem_path"
+ MY_RUBY_HOME="$rvm_ruby_home"
+ RUBY_VERSION="$rvm_ruby_string"
IRBRC="$rvm_ruby_irbrc"
export GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
if [[ -z "$IRBRC" ]] ; then unset IRBRC ; fi
@@ -290,12 +290,12 @@
if [[ ! -z "$rvm_verbose_flag" ]] ; then
$rvm_scripts_path/log "info" "Now using $(echo $rvm_ruby_string | tr '-' ' ')"
fi
- new_path=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
- new_path=$MY_RUBY_HOME/bin:$GEM_HOME/bin:$rvm_bin_path:$new_path
+ new_path="$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)"
+ new_path="$MY_RUBY_HOME/bin:$GEM_HOME/bin:$GEM_HOME%global/bin:$rvm_bin_path:$new_path"
fi
if [[ ! -z "$rvm_default_flag" ]] && [[ "default" != "$rvm_ruby_interpreter" ]] ; then
if [[ "root" = "$(whoami)" ]] ; then
for binary in erb gem irb rake rdoc ri ruby testrb ; do
@@ -311,10 +311,10 @@
rm -f $rvm_bin_path/default*
else
RUBY_VERSION="$($rvm_ruby_home/bin/ruby -v | sed 's#^\(.*\) (.*$#\1#')"
export GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION
- echo "export PATH=\"$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:$rvm_bin_path:\$PATH\"" > $rvm_config_path/default
+ echo "export PATH=\"$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:$rvm_ruby_gem_home%global/bin:$rvm_bin_path:\$PATH\"" > $rvm_config_path/default
for variable in RUBY_VERSION GEM_HOME GEM_PATH MY_RUBY_HOME IRBRC rvm_ruby_string rvm_gem_set_name MAGLEV_HOME ; do
eval "export $variable"
eval value=\$${variable}
if [[ ! -z "$value" ]] ; then