scripts/selector in rvm-0.0.75 vs scripts/selector in rvm-0.0.76
- old
+ new
@@ -169,10 +169,14 @@
PATH=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
PATH=$rvm_bin_path:$PATH ; export PATH
if [[ -s $rvm_path/default ]] ; then
source $rvm_path/default
+
+ if [[ ! -z "$rvm_verbose_flag" ]] ; then
+ __rvm_log "info" "Now using default ruby."
+ fi
else
rvm_ruby_interpreter="system"
__rvm_log "warn" "no default rvm specified, defaulting to pre-rvm system."
unset GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
if [[ -s $rvm_path/system ]] ; then source $rvm_path/system ; fi
@@ -196,25 +200,36 @@
for binary in erb gem irb rake rdoc ri ruby testrb ; do
rm -f /usr/local/bin/$binary
done
fi
+ if [[ ! -z "$rvm_verbose_flag" ]] ; then
+ __rvm_log "info" "Now using system ruby."
+ fi
+
else
GEM_HOME=$rvm_ruby_gem_home ; export GEM_HOME
GEM_PATH=$rvm_ruby_gem_home ; export GEM_PATH
MY_RUBY_HOME=$rvm_ruby_home ; export MY_RUBY_HOME
RUBY_VERSION=$rvm_ruby_string ; export RUBY_VERSION
IRBRC="$rvm_ruby_irbrc" ; export IRBRC
if [[ -z "$IRBRC" ]] ; then unset IRBRC ; fi
if [[ ! -d $MY_RUBY_HOME ]] ; then
- __rvm_log "warn" "$rvm_ruby_interpreter $rvm_ruby_string is not installed.\nTo install do: 'rvm install $rvm_ruby_string'"
+ __rvm_log "warn" "$rvm_ruby_interpreter $rvm_ruby_string is not installed."
if [[ ! -z "$rvm_install_on_use_flag" ]] ; then
__rvm_install_ruby $rvm_ruby_interpreter $rvm_ruby_version $rvm_ruby_patch_level
+ else
+ __rvm_log "info" "To install do: 'rvm install $rvm_ruby_string'"
+ return 1
fi
fi
+ if [[ ! -z "$rvm_verbose_flag" ]] ; then
+ __rvm_log "info" "Now using $(echo $rvm_ruby_string | tr '-' ' ')"
+ fi
+
__rvm_irbrc
PATH=$(echo $PATH | tr ':' '\n' | awk '$0 !~ /rvm/' | paste -sd : -)
PATH=$rvm_bin_path:$PATH ; export PATH
PATH=$MY_RUBY_HOME/bin:$GEM_HOME/bin:$rvm_path/bin:$PATH ; export PATH
@@ -247,11 +262,11 @@
fi
done ; unset variable value
if [[ -s "$rvm_path/bin/$rvm_ruby_string" ]] ; then
ln -fs "$rvm_path/bin/$rvm_ruby_string" "$rvm_path/bin/default-ruby" # So that people know what it's for :)
- ln -fs "$rvm_path/bin/gem-$rvm_ruby_string" "$rvm_path/bin/default-gem"
- ln -fs "$rvm_path/bin/irb-$rvm_ruby_string" "$rvm_path/bin/default-irb"
+ ln -fs "$rvm_path/$rvm_ruby_string/bin/gem" "$rvm_path/bin/default-gem"
+ ln -fs "$rvm_path/$rvm_ruby_string/bin/irb" "$rvm_path/bin/default-irb"
else
rm -f $rvm_path/bin/default*
fi
fi
unset rvm_default_flag