rvm 0.1.37 → 0.1.38

data/install

@@ -171,8 +171,8 @@ fi
 #
 spinner
 mkdir -p "$rvm_gemsets_path"
-for gemset_file in $(cd $install_source_path/gemsets ; find . -iname '*.gems' | sed 's/\.\///') ; do
-  source_path="$install_source_path/gemsets"
+for gemset_file in $(cd gemsets ; find . -iname '*.gems' | sed 's/\.\///') ; do
+  source_path="$(pwd)/gemsets"
   destination="$rvm_gemsets_path/$gemset_file"
   destination_path="$(dirname "$destination")"
   if [[ ! -s "$destination" ]] ; then
@@ -271,10 +271,10 @@ printf "\n    ~ Wayne\n"
 
 if [[ "$upgrade_flag" -eq 1 ]] ; then
   printf "\n$(tput setaf 6)Upgrade Notes\n"
-  printf "\n  * Gemset separator is '@' and will remain unless any rubies error using it."
-  printf "\n  * If you encounter any issues with a ruby your best bet is to 'rvm remove X ; rvm install X' "
   printf "\n  * 'rvm notes' tells you OS dependency packages for installing rubies."
+  printf "\n  * If you encounter any issues with a ruby your best bet is to 'rvm remove X ; rvm install X' "
   printf "\n  * 1.8.7 default patchlevel is p174, override ~/.rvm/config/db in ~/.rvm/config/user"
+  printf "\n  * Gemset separator is '@' and will remain unless any rubies error using it."
   printf "\n$(tput sgr0)\n"
   printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"
 else

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 1
-:patch: 37
+:patch: 38

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.1.37"
+  s.version = "0.1.38"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-06-02}
+  s.date = %q{2010-06-03}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter environments and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}

data/scripts/alias

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+unset rvm_default_flag rvm_wrapper_name 
+
 if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
 
 trap "if [[ -d $rvm_tmp_path/ ]] && [[ -f $rvm_tmp_path/$$ ]] ; then rm -f $rvm_tmp_path/$$ > /dev/null 2>&1 ; fi ; exit" 0 1 2 3 15
@@ -41,7 +43,7 @@ create_alias() {
     if [[ -z "$rvm_alias" ]] ; then
       rvm_ruby_string="$rvm_environment_identifier"
       rvm_expanding_aliases=1
-      __rvm_ruby_string >& /dev/null
+      __rvm_become
       unset rvm_expanding_aliases
       if [[ -z "$rvm_ruby_string" ]]; then
         $rvm_scripts_path/log "error" "unknown ruby string specified"

data/scripts/cli

@@ -3,6 +3,9 @@
 __rvm_usage() { cat "${rvm_path:-$HOME/.rvm}/README" | ${PAGER:-less} ; }
 
 __rvm_parse_args() {
+
+  echo "$@" >> $HOME/.rvm_history
+
   if echo "$@" | grep -q 'trace' ; then echo "$@" ; __rvm_version ; fi
 
   while [[ $# -gt 0 ]] ; do
@@ -290,6 +293,13 @@ __rvm_parse_args() {
         rvm_wrapper_name="${rvm_token/--/}"
       ;;
 
+      --alias)
+        if [[ -n "$1" ]]; then
+          export rvm_ruby_aliases="$(echo "$1" | tr ',' ' ')"
+          shift
+        fi
+      ;;
+
       --symlink)
         $rvm_scripts_path/log "warn" "--symlink has been removed, please see 'rvm wrapper'."
         shift
@@ -492,7 +502,9 @@ rvm() {
           __rvm_gemset_use
         fi
       else
+        export rvm_ruby_strings
         $rvm_scripts_path/gemsets $rvm_ruby_args
+        unset rvm_ruby_strings
 
         # Clear the gemset.
         if [[ "$rvm_delete_flag" -eq 1 ]] ; then

data/scripts/env

@@ -21,10 +21,8 @@ if [[ -z "$environment_name" ]]; then
   usage ; exit 1
 fi
 
-rvm_ruby_string="${environment_name}" ;
-
-# Ensure the string is valid before printing an env.
-{ __rvm_ruby_string && __rvm_select && __rvm_use; }> /dev/null 2>&1
+# Exit when we encounter an unknown environment name.
+__rvm_become "$environment_name"
 
 if [[ "$?" = 0 ]]; then
   __rvm_use

data/scripts/fetch

@@ -6,9 +6,9 @@ trap "if [[ -d $rvm_tmp_path/ ]] && [[ -f $rvm_tmp_path/$$ ]] ; then rm -f $rvm_
 
 record_md5() {
   if [[ "Darwin" = "$(uname)" ]] || [[ "FreeBSD" = "$(uname)" ]]; then
-    archive_md5="$(/sbin/md5 $archive | awk '{print $NF}')"
+    archive_md5="$(/sbin/md5 -q "${archive}")"
   else
-    archive_md5="$(md5sum $archive | awk '{print $1}')"
+    archive_md5="$(md5sum "${archive}" | awk '{print $1}')"
   fi
   $rvm_scripts_path/db "$rvm_config_path/md5" "$archive" "$archive_md5"
 }

data/scripts/gemsets

@@ -342,39 +342,18 @@ gemset_initial() {
   for gemsets_path in "$rvm_gemsets_path" "$rvm_gemsets_path/$rvm_ruby_interpreter" "$rvm_gemsets_path/$rvm_ruby_interpreter/$rvm_ruby_version" "$rvm_gemsets_path/$rvm_ruby_interpreter/$rvm_ruby_version/$rvm_ruby_patch_level" ; do
     if [[ ! -z "$rvm_gemset_name" ]] ; then
       if [[ -s "${gemsets_path}/${rvm_gemset_name}.gems" ]] ; then
-        printf $(rvm gemset import "${gemsets_path}/${rvm_gemset_name}.gems") > /dev/null
+        (source "$rvm_scripts_path/rvm"; rvm gemset import "${gemsets_path}/${rvm_gemset_name}.gems") > /dev/null
       fi
     else
       if [[ -d "$gemsets_path" ]] && [[ -s "${gemsets_path}/default.gems" ]] ; then
-        printf $(rvm gemset import "$gemsets_path/default.gems") > /dev/null
+        (source "$rvm_scripts_path/rvm"; rvm gemset import "$gemsets_path/default.gems") > /dev/null
       fi
       if [[ -d "$gemsets_path" ]] && [[ -s "${gemsets_path}/global.gems" ]] ; then
-        printf $(rvm use "$rvm_ruby_string@global" --create ; rvm gemset import "${gemsets_path}/global.gems") > /dev/null
+        (source "$rvm_scripts_path/rvm"; rvm use "$rvm_ruby_string@global" --create ; rvm gemset import "${gemsets_path}/global.gems") > /dev/null
       fi
     fi
   done
   $rvm_scripts_path/log "info" "Installation of gems for $(__rvm_environment_identifier) is complete."
-
-  # Original code, which swapped out the environments on the fly.
-  #post_install_gems="rdoc rake"
-  #for rvm_gem_name in $(echo $post_install_gems); do
-  #  home="$GEM_HOME" ; path="$GEM_PATH" # Save
-  #  for dir in $rvm_ruby_global_gems_path $rvm_ruby_gem_home ; do
-  #    GEM_HOME="$dir" ; GEM_PATH="$dir" ; BUNDLE_PATH="$dir"
-  #    export GEM_HOME GEM_PATH BUNDLE_PATH
-  #    __rvm_run "gems.install" "$rvm_ruby_home/bin/gem install --no-rdoc --no-ri $rvm_gem_name $rvm_gem_options" "Installing $rvm_gem_name to $dir"
-
-  #    if [[ -x $rvm_ruby_gem_home/bin/$rvm_gem_name ]] ; then
-  #      if [[ "$rvm_ruby_gem_home" != "$rvm_ruby_home" ]] && [[ ! -x $rvm_ruby_home/bin/$rvm_gem_name ]] ; then
-  #        ln -nfs $rvm_ruby_gem_home/bin/$rvm_gem_name $rvm_ruby_home/bin/$rvm_gem_name
-  #      fi
-  #      __rvm_inject_ruby_shebang "$rvm_ruby_home/bin/$rvm_gem_name"
-  #      __rvm_inject_gem_env "$rvm_ruby_home/bin/$rvm_gem_name"
-  #    fi
-  #  done ; unset home path dir
-  #  GEM_HOME="$home" ; GEM_PATH="$path" ; BUNDLE_PATH="$home"
-  #  export GEM_HOME GEM_PATH BUNDLE_PATH
-  #done ; unset rvm_gem_name post_install_gems
 }
 
 unset GEM_PATH
@@ -389,7 +368,17 @@ gems_args=$(echo "$*" | awk '{$1="" ; print}' | sed -e 's/^[[:space:]]*//' -e 's
 export rvm_gemset_name
 
 if [[ "import" = "$action" ]] || [[ "load" = "$action" ]] ; then
-  gemset_import
+  if [[ -z "$rvm_ruby_strings" ]]; then
+    gemset_import
+  else
+    original_env="$(__rvm_environment_identifier)"
+    for rvm_ruby_string in $(echo "$rvm_ruby_strings" | tr "," " "); do
+      __rvm_become
+      gemset_import
+    done
+    __rvm_become "$original_env"
+    unset original_env
+  fi
 elif [[ "export" = "$action" ]] || [[ "dump" = "$action" ]] ; then
   gemset_export
 elif [[ "create" = "$action" ]] ; then

data/scripts/info

@@ -135,7 +135,7 @@ if [[ -z "$ruby_strings" ]] ; then
   info_sections
 else
   for ruby_string in $(printf $ruby_strings | tr ',' ' ') ; do
-    rvm_ruby_string="${ruby_string}" ;  __rvm_select ; __rvm_use
+    __rvm_become "$ruby_string"
     printf "$(__rvm_environment_identifier):\n"
     info_sections
   done

data/scripts/install

@@ -171,8 +171,8 @@ fi
 #
 spinner
 mkdir -p "$rvm_gemsets_path"
-for gemset_file in $(cd $install_source_path/gemsets ; find . -iname '*.gems' | sed 's/\.\///') ; do
-  source_path="$install_source_path/gemsets"
+for gemset_file in $(cd gemsets ; find . -iname '*.gems' | sed 's/\.\///') ; do
+  source_path="$(pwd)/gemsets"
   destination="$rvm_gemsets_path/$gemset_file"
   destination_path="$(dirname "$destination")"
   if [[ ! -s "$destination" ]] ; then
@@ -271,10 +271,10 @@ printf "\n    ~ Wayne\n"
 
 if [[ "$upgrade_flag" -eq 1 ]] ; then
   printf "\n$(tput setaf 6)Upgrade Notes\n"
-  printf "\n  * Gemset separator is '@' and will remain unless any rubies error using it."
-  printf "\n  * If you encounter any issues with a ruby your best bet is to 'rvm remove X ; rvm install X' "
   printf "\n  * 'rvm notes' tells you OS dependency packages for installing rubies."
+  printf "\n  * If you encounter any issues with a ruby your best bet is to 'rvm remove X ; rvm install X' "
   printf "\n  * 1.8.7 default patchlevel is p174, override ~/.rvm/config/db in ~/.rvm/config/user"
+  printf "\n  * Gemset separator is '@' and will remain unless any rubies error using it."
   printf "\n$(tput sgr0)\n"
   printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"
 else

data/scripts/manage

@@ -101,6 +101,7 @@ __rvm_install_source() {
 }
 
 __rvm_install_ruby() {
+  
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
 
   if [[ ! -z "$RUBYOPT" ]] ; then ruby_options="$RUBYOPT" ; unset RUBYOPT ; fi
@@ -638,7 +639,6 @@ RubyWrapper
     *) $rvm_scripts_path/log "fail" "Ruby interpreter '$rvm_ruby_interpreter' is not known."
 
   esac
-
   
   # Import the initial gemsets.
   (source $rvm_scripts_path/rvm; rvm use "$rvm_ruby_string"; $rvm_scripts_path/gemsets initial)
@@ -764,6 +764,16 @@ __rvm_fetch_ruby() {
   fi
 }
 
+__rvm_check_default() {
+  default_ruby_interpreter="$(rvm alias show default 2>/dev/null | awk -F"${rvm_gemset_seperator:-"@"}" '{print $1}')"
+  current_ruby_interpreter="$(echo "$rvm_ruby_string" | awk -F"${rvm_gemset_seperator:-"@"}" '{print $1}')"
+  if [[ -n "$current_ruby_interpreter" && "$current_ruby_interpreter" == "$default_ruby_interpreter" ]]; then
+    # In a new subshell, set the default interpeter to system.
+    (source $rvm_scripts_path/rvm; rvm use system --default)
+  fi
+  unset default_ruby_interpreter current_ruby_interpreter
+}
+
 __rvm_uninstall_ruby() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
 
@@ -780,6 +790,9 @@ __rvm_uninstall_ruby() {
       fi
     done ; unset dir
     __rvm_remove_gemsets
+
+    __rvm_check_default
+
   else
     $rvm_scripts_path/log "fail" "Cannot uninstall unknown package '$rvm_ruby_string'"
   fi ; unset rvm_uninstall_flag
@@ -801,9 +814,8 @@ __rvm_remove_ruby() {
         rm -f $rvm_bin_path/$rvm_ruby_string
       fi
 
-      if grep -q "$rvm_ruby_string" "$rvm_config_path/default" 2>/dev/null ; then
-        rm -f "$rvm_config_path/default"
-      fi
+      __rvm_check_default
+
     done ; unset dir
     __rvm_remove_gemsets
   else
@@ -839,6 +851,17 @@ __rvm_post_install() {
 
   __rvm_irbrc
   __rvm_generate_default_docs
+
+  if [[ -n "$rvm_ruby_aliases" ]]; then
+    $rvm_scripts_path/log "info" "Setting up aliases for $rvm_ruby_string"
+    for ruby_alias in $rvm_ruby_aliases; do
+      $rvm_scripts_path/log "info" "Aliasing $rvm_ruby_string to $ruby_alias"
+      $rvm_scripts_path/alias delete "$ruby_alias" > /dev/null 2>&1
+      $rvm_scripts_path/alias create "$ruby_alias" "$rvm_ruby_string" > /dev/null 2>&1
+    done
+    unset rvm_ruby_aliases ruby_alias
+  fi
+
 }
 
 __rvm_generate_default_docs() {

data/scripts/rvm-install

@@ -171,8 +171,8 @@ fi
 #
 spinner
 mkdir -p "$rvm_gemsets_path"
-for gemset_file in $(cd $install_source_path/gemsets ; find . -iname '*.gems' | sed 's/\.\///') ; do
-  source_path="$install_source_path/gemsets"
+for gemset_file in $(cd gemsets ; find . -iname '*.gems' | sed 's/\.\///') ; do
+  source_path="$(pwd)/gemsets"
   destination="$rvm_gemsets_path/$gemset_file"
   destination_path="$(dirname "$destination")"
   if [[ ! -s "$destination" ]] ; then
@@ -271,10 +271,10 @@ printf "\n    ~ Wayne\n"
 
 if [[ "$upgrade_flag" -eq 1 ]] ; then
   printf "\n$(tput setaf 6)Upgrade Notes\n"
-  printf "\n  * Gemset separator is '@' and will remain unless any rubies error using it."
-  printf "\n  * If you encounter any issues with a ruby your best bet is to 'rvm remove X ; rvm install X' "
   printf "\n  * 'rvm notes' tells you OS dependency packages for installing rubies."
+  printf "\n  * If you encounter any issues with a ruby your best bet is to 'rvm remove X ; rvm install X' "
   printf "\n  * 1.8.7 default patchlevel is p174, override ~/.rvm/config/db in ~/.rvm/config/user"
+  printf "\n  * Gemset separator is '@' and will remain unless any rubies error using it."
   printf "\n$(tput sgr0)\n"
   printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"
 else

data/scripts/selector

@@ -293,12 +293,19 @@ __rvm_use() {
     new_path="$GEM_HOME/bin:$rvm_ruby_global_gems_path/bin:$MY_RUBY_HOME/bin:$rvm_bin_path:$new_path"
   fi
 
+  # Export ruby string and gem set me for extrenal scripts to take advantage of them.
+  if [[ ! -z "$rvm_ruby_string" ]]  ; then export rvm_ruby_string  ; fi
+  if [[ ! -z "$rvm_gemset_name" ]]  ; then export rvm_gemset_name ; fi
+  if [[ ! -z "$new_path" ]]         ; then export PATH="$new_path" ; unset new_path ; fi
+  if [[ ! -z "$rvm_rvmrc_flag" ]]   ; then __rvm_set_rvmrc ; fi
+
+  environment_id="$(__rvm_environment_identifier)"
+
   if [[ ! -z "$rvm_default_flag" ]] && [[ "default" != "$rvm_ruby_interpreter" ]] ; then
     if [[ "root" = "$(whoami)" ]] ; then
       # By not providing the name it uses the base ruby binary names.
       $rvm_scripts_path/wrapper $rvm_ruby_string
     fi
-    local environment_id="$(__rvm_environment_identifier)"
     if [[ "system" = "$rvm_ruby_interpreter" ]] ; then
       $rvm_scripts_path/alias delete default &> /dev/null
       rm -f $rvm_config_path/default
@@ -308,7 +315,6 @@ __rvm_use() {
     else
       RUBY_VERSION="$($rvm_ruby_home/bin/ruby -v | sed 's#^\(.*\) (.*$#\1#')"
       export GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION
-      # Delete + then create the default alias.
       $rvm_scripts_path/alias delete default &> /dev/null
       $rvm_scripts_path/alias create default "$environment_id" >& /dev/null
       ln -nfs $rvm_environments_path/$environment_id $rvm_environments_path/default
@@ -317,15 +323,11 @@ __rvm_use() {
   fi ; unset rvm_default_flag
 
   if [[ ! -z "$rvm_wrapper_name" ]] ; then
-    $rvm_scripts_path/wrapper "$rvm_ruby_string" "$rvm_wrapper_name" > /dev/null 2>&1
+    $rvm_scripts_path/wrapper "$environment_id" "$rvm_wrapper_name" > /dev/null 2>&1
     unset rvm_wrapper_name
   fi
 
-  if [[ ! -z "$rvm_rvmrc_flag" ]]   ; then __rvm_set_rvmrc ; fi
-  # Export ruby string and gem set me for extrenal scripts to take advantage of them.
-  if [[ ! -z "$rvm_ruby_string" ]]  ; then export rvm_ruby_string  ; fi
-  if [[ ! -z "$rvm_gemset_name" ]]  ; then export rvm_gemset_name ; fi
-  if [[ ! -z "$new_path" ]]         ; then export PATH="$new_path" ; unset new_path ; fi
+  unset environment_id
 
   if [[ "maglev" = "$rvm_ruby_interpreter" ]] ; then
     export MAGLEV_HOME="$rvm_ruby_home"

data/scripts/set

@@ -17,8 +17,8 @@ fi
 
 # Perform an action using one of a selected ruby's specified binaries.
 __rvm_ruby_do() {
-  __rvm_select
-  __rvm_use
+  # Return on invalid rubies.
+  __rvm_become || return 1
 
   binary="$(echo $action | sed 's#do$##')"
   if [[ -x "$rvm_ruby_home/bin/$binary" ]] ; then

data/scripts/update

@@ -171,8 +171,8 @@ fi
 #
 spinner
 mkdir -p "$rvm_gemsets_path"
-for gemset_file in $(cd $install_source_path/gemsets ; find . -iname '*.gems' | sed 's/\.\///') ; do
-  source_path="$install_source_path/gemsets"
+for gemset_file in $(cd gemsets ; find . -iname '*.gems' | sed 's/\.\///') ; do
+  source_path="$(pwd)/gemsets"
   destination="$rvm_gemsets_path/$gemset_file"
   destination_path="$(dirname "$destination")"
   if [[ ! -s "$destination" ]] ; then
@@ -271,10 +271,10 @@ printf "\n    ~ Wayne\n"
 
 if [[ "$upgrade_flag" -eq 1 ]] ; then
   printf "\n$(tput setaf 6)Upgrade Notes\n"
-  printf "\n  * Gemset separator is '@' and will remain unless any rubies error using it."
-  printf "\n  * If you encounter any issues with a ruby your best bet is to 'rvm remove X ; rvm install X' "
   printf "\n  * 'rvm notes' tells you OS dependency packages for installing rubies."
+  printf "\n  * If you encounter any issues with a ruby your best bet is to 'rvm remove X ; rvm install X' "
   printf "\n  * 1.8.7 default patchlevel is p174, override ~/.rvm/config/db in ~/.rvm/config/user"
+  printf "\n  * Gemset separator is '@' and will remain unless any rubies error using it."
   printf "\n$(tput sgr0)\n"
   printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"
 else

data/scripts/utility

@@ -115,7 +115,7 @@ __rvm_cleanup_variables() {
 
   if [[ "$rvm_sticky_flag" = "1" ]] ; then export rvm_gemset_name ; else unset rvm_gemset_name  ; fi
 
-  unset rvm_action rvm_irbrc_file rvm_command rvm_error_message rvm_url rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_import_flag rvm_export_flag rvm_self_flag rvm_gem_flag rvm_rubygems_flag rvm_debug_flag rvm_delete_flag rvm_summary_flag rvm_test_flag _rvm_spec_flag rvm_json_flag rvm_yaml_flag rvm_shebang_flag rvm_env_flag rvm_tail_flag rvm_use_flag rvm_dir_flag rvm_list_flag rvm_empty_flag rvm_file_name rvm_benchmark_flag rvm_clear_flag rvm_name_flag rvm_verbose_flag rvm_user_flag rvm_system_flag rvm_ruby_configure_flags rvm_uninstall_flag rvm_install_flag rvm_llvm_flag rvm_ruby_bits rvm_ruby_patch rvm_sticky_flagrvm_rvmrc_flag rvm_gems_flag rvm_only_path_flag rvm_docs_flag
+  unset rvm_action rvm_irbrc_file rvm_command rvm_error_message rvm_url rvm_force_flag rvm_all_flag rvm_reconfigure_flag rvm_make_flags rvm_bin_flag rvm_import_flag rvm_export_flag rvm_self_flag rvm_gem_flag rvm_rubygems_flag rvm_debug_flag rvm_delete_flag rvm_summary_flag rvm_test_flag _rvm_spec_flag rvm_json_flag rvm_yaml_flag rvm_shebang_flag rvm_env_flag rvm_tail_flag rvm_use_flag rvm_dir_flag rvm_list_flag rvm_empty_flag rvm_file_name rvm_benchmark_flag rvm_clear_flag rvm_name_flag rvm_verbose_flag rvm_user_flag rvm_system_flag rvm_ruby_configure_flags rvm_uninstall_flag rvm_install_flag rvm_llvm_flag rvm_ruby_bits rvm_ruby_patch rvm_sticky_flag rvm_rvmrc_flag rvm_gems_flag rvm_only_path_flag rvm_docs_flag rvm_ruby_aliases
 }
 
 # Unset ruby-specific variables
@@ -125,7 +125,6 @@ __rvm_unset_ruby_variables() {
 
 __rvm_set_rvmrc() {
   if [[ "$HOME" != "$(pwd)" ]] ; then
-    if [[ "$rvm_create_flag" -eq 1 ]] ; then flags="--create " ; fi
     if [[ "$rvm_verbose_flag" -eq 1 ]] ; then flags="use " ; fi
 
     if [[ -s .rvmrc ]] ; then
@@ -133,7 +132,10 @@ __rvm_set_rvmrc() {
       $rvm_scripts_path/log "warning" ".rvmrc is not empty, moving aside to preserve."
     fi
 
-    echo "rvm $flags $(basename $rvm_ruby_gem_home)" > .rvmrc
+    local identifier=$(__rvm_environment_identifier)
+    printf "if [[ -s \"$rvm_environments_path/$identifier\" ]] ; then\n  . \"$rvm_environments_path/$identifier\"" > .rvmrc
+    printf "\nelse\n  rvm --create $flags \"$identifier\"\nfi" >> .rvmrc
+
     unset flags
   else
     $rvm_scripts_path/log "error" ".rvmrc cannot be set in your home directory. \n The home .rvmrc is for global rvm settings only."
@@ -541,9 +543,23 @@ __rvm_environment_identifier() {
   unset ruby_string
 }
 
+__rvm_become() {
+  [[ -n "$1" ]] && rvm_ruby_string="$1"
+  { __rvm_ruby_string && __rvm_select && __rvm_use; } > /dev/null 2>&1
+}
+
 __rvm_ensure_has_enviroment_files() {
   local environment_identifier="$(__rvm_environment_identifier)"
   file_name="${rvm_environments_path}/$environment_identifier"
+
+  # Ensure system is a blank file.
+  if [[ "$environment_identifier" == "system" ]]; then
+    rm -f "$file_name"
+    mkdir -p "$(dirname "$file_name")"
+    touch "$file_name"
+    return
+  fi
+
   if [[ ! -s "$file_name" ]] ; then
     mkdir -p "${rvm_environments_path}"
     echo "export PATH=\"${rvm_ruby_gem_home}/bin:${rvm_ruby_global_gems_path}/bin:${rvm_ruby_home}/bin:${rvm_bin_path}:\$PATH\"" > $file_name

data/scripts/wrapper

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-unset rvm_default_flag
+# Prevent it from recursing.
+unset rvm_default_flag rvm_wrapper_name
 
 source $rvm_scripts_path/initialize
 source $rvm_scripts_path/utility
@@ -70,9 +71,7 @@ if [[ -z "$binaries" ]] ; then
 fi
 
 # Use the correct ruby.
-rvm_ruby_string="${ruby_string}"
-__rvm_select > /dev/null 2>&1
-__rvm_use    > /dev/null 2>&1
+__rvm_become "$ruby_string"
 
 __rvm_ensure_has_enviroment_files
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  hash: 81
+  hash: 87
   prerelease: false
   segments: 
   - 0
   - 1
-  - 37
-  version: 0.1.37
+  - 38
+  version: 0.1.38
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-02 00:00:00 -04:00
+date: 2010-06-03 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []