scripts/utility in rvm-0.1.26 vs scripts/utility in rvm-0.1.27

- old
+ new

@@ -274,11 +274,11 @@ chmod +x $rvm_bin_path/$rvm_ruby_package_name } # Load default ruby, if default is not set load system ruby. __rvm_load_defaults() { - if [[ ! -s "$rvm_config_path/system" ]] ; then + if [[ ! -s "$rvm_config_path/system" ]] && [[ "root" != "$(whoami)" ]] ; then for variable in RUBY_VERSION GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME ; do eval value=\$${variable} if [[ -z "${value/ /}" ]] ; then echo "unset ${variable}" >> $rvm_config_path/system else @@ -423,11 +423,11 @@ done < <(svn list http://svn.ruby-lang.org/repos/ruby/tags/ | awk '/^v1_[8|9]/') echo -e "(ruby-)1.8.6(-p399)\n(ruby-)1.8.6-head\n(ruby-)1.8.7(-p248)\n(ruby-)1.8.7-head\n(ruby-)1.9.1(-p243)\n(ruby-)1.9.1(-p376)\n(ruby-)1.9.1-head\n(ruby-)1.9.2-preview1\nruby-head\n" echo -e "jruby-1.2.0\njruby-1.3.1\njruby(-1.4.0) # the default\njruby-head" echo -e "rbx(-prc1) # default\nrbx-head" echo -e "ree-1.8.6\nree(-1.8.7) # the default\nree-1.8.6-head\nree-1.8.7-head" - echo -e "maglev(-23101)\nmaglev-head" + echo -e "maglev(-23191)\nmaglev-head" echo -e "mput(-head) # shyouhei head, the default mput" echo -e "ironruby-0.9.3\nironruby-1.0-rc2\nironruby-head" if [[ "Darwin" = "$(uname)" ]] ; then echo -e "macruby(-nightly) # the default macruby\nmacruby-head # Build from the macruby git repository" fi @@ -641,10 +641,14 @@ which gem > /dev/null 2>&1 if [[ $? -gt 0 ]] ; then return 0 ; fi # Stop if no 'gem' command is available. rvm_ruby_global_gems_path="$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator}global" + #if [[ -z "$(echo $rvm_ruby_gem_home | grep "$rvm_path")" ]] ; then + # $rvm_scripts_path/log "warn" "Gemsets cannot be used with system ruby installs (yet)." + #fi + if [[ -z "$rvm_gemset_name" ]] ; then # No longer defaulting to 'sticky' gem sets. # Set 'rvm_sticky_flag=1' in ~/.rvmrc to enable. if [[ ! -z "$rvm_sticky_flag" ]] ; then if [[ ! -z "$GEM_HOME" ]] ; then @@ -713,9 +717,12 @@ fi ; export rvm_ruby_gem_path rvm_ruby_gem_home } # Use a gemset specified by 'rvm_ruby_gem_home' __rvm_gemset_use() { + #if [[ -z "$(echo $rvm_ruby_gem_home | grep "rvm")" ]] ; then + # $rvm_scripts_path/log "warn" "Gemsets cannot be used with system ruby installs (yet)." + #fi if [[ ! -z "$rvm_ruby_gem_home" ]] ; then if [[ ! -d "$rvm_ruby_gem_home" ]] ; then if [[ "$rvm_gemset_create_on_use_flag" -eq 1 ]] || [[ "$rvm_create_flag" -eq 1 ]]; then $rvm_scripts_path/gemsets create $rvm_gemset_name else