rvm 0.1.44 → 0.1.45

data/scripts/maglev

@@ -3,7 +3,7 @@
 if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; fi
 
 system="$(uname -s)"
-if [[ $system = "SunOS" ]] && [[ "$(uname -m)" = "i86pc" ]] ; then OS="Solaris-x86" ; fi
+if [[ $system = "SunOS" ]] && [[ "$(uname -m)" = "i86pc" ]] ; then system="Solaris-x86" ; fi
 version="MagLev-${1}.${system}"
 gsname="GemStone-${1}.${system}"
 zipfile=${version}.zip

data/scripts/manage

@@ -716,6 +716,11 @@ __rvm_fetch_from_github() {
     rm -rf "$rvm_ruby_repo_path"
     builtin cd "$rvm_home"
     __rvm_run "$1.repo" "git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_repo_path" "Cloning $rvm_ruby_repo_url"
+    result=$? ; if [[ "$result" -gt 0 ]] ; then
+      rvm_ruby_repo_http_url="$(echo $rvm_ruby_repo_url | sed -e 's/git:/http:/')"
+      $rvm_scripts_path/log "info" "Could not fetch $rvm_ruby_repo_url - trying $rvm_ruby_repo_http_url"
+      __rvm_run "$1.repo" "git clone --depth 1 $rvm_ruby_repo_http_url $rvm_ruby_repo_path" "Cloning $rvm_ruby_repo_http_url"
+    fi
   else
     local branch="${2:-"master"}"
     builtin cd "$rvm_ruby_repo_path"
@@ -803,10 +808,15 @@ __rvm_fetch_ruby() {
         fi
       else
         rm -rf "$rvm_ruby_repo_path"
+        rvm_ruby_repo_http_url="$(echo $rvm_ruby_repo_url | sed -e 's/git:/http:/')"
         $rvm_scripts_path/log "info" "Cloning from $rvm_ruby_repo_url, this may take a while depending on your connection..."
         git clone --depth 1 "$rvm_ruby_repo_url" "$rvm_ruby_repo_path"
         result=$? ; if [[ "$result" -gt 0 ]] ; then
-          $rvm_scripts_path/log "error" "There has been an error while trying to fetch the repository. Aborting the installation." ; __rvm_pushpop ; return $result
+          $rvm_scripts_path/log "info" "cloning from $rvm_ruby_repo_url failed, now attempting to clone from $rvm_ruby_repo_http_url, this may take a while depending on your connection..."
+          git clone "$rvm_ruby_repo_http_url" "$rvm_ruby_repo_path"
+          result=$? ; if [[ "$result" -gt 0 ]] ; then
+            $rvm_scripts_path/log "error" "There has been an error while trying to fetch the repository. Aborting the installation." ; __rvm_pushpop ; return $result
+          fi
         fi
       fi
     else
@@ -1005,11 +1015,11 @@ __rvm_post_install() {
 
   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
+    while read -r ruby_alias; 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
+    done < <(echo "$rvm_ruby_string" | \tr ' ' '\n' | sort -u)
     unset rvm_ruby_aliases ruby_alias
   fi
 }

data/scripts/migrate

@@ -0,0 +1,117 @@
+#!/usr/bin/env bash
+
+unset GREP_OPTIONS
+
+source "$rvm_scripts_path/base"
+
+usage() {
+  echo "Usage: rvm migrate from to" >&2
+  echo "Moves all gemsets from one ruby to another." >&2
+  exit 1
+}
+
+confirm() {
+  printf "$1 (Y/n): "
+  local confirmation_response
+  read -r confirmation_response
+  [[ -z "$confirmation_response" ]] || echo "$confirmation_response" | grep -qi '^y'
+}
+
+die_with_error() {
+  $rvm_scripts_path/log "fail" "$1"
+  exit "${2:-1}"
+}
+
+expand_ruby_name() {
+  $rvm_scripts_path/tools strings "$1" | awk -F"$rvm_gemset_separator" '{print $1}'
+}
+
+migrate_rubies() {
+  expanded_source="$(expand_ruby_name "$source_ruby")"
+  expanded_destination="$(expand_ruby_name "$destination_ruby")"
+  
+  if [[ -z "$expanded_source" ]]; then
+    die_with_error "Could not expand source ruby '$source_ruby'"
+  elif [[ -z "$expanded_destination" ]]; then
+    die_with_error "Could not expand destination ruby '$destination_ruby'"
+  elif [[ "$expanded_destination" = "$expanded_source" ]]; then
+    die_with_error "Source and Destination Ruby are the same ($expanded_destination)"
+  elif [[ ! -d "$rvm_rubies_path/$expanded_source" ]]; then
+    die_with_error "Ruby '$expanded_source' is not installed - please install it first."
+  elif [[ ! -d "$rvm_rubies_path/$expanded_destination" ]]; then
+    die_with_error "Ruby '$expanded_destination' is not installed - please install it first."
+  fi
+  
+  echo "Are you sure you wish to MOVE gems from $expanded_source to $expanded_destination?"
+  confirm "This will overwrite existing gems in $expanded_destination and remove them from $expanded_source" || return 1
+  
+  echo "Moving gemsets..."
+  
+  while read -r origin_gemset; do
+    [[ "$origin_gemset" = "$expanded_source" || "$origin_gemset" = "$expanded_source$rvm_gemset_separator"* ]] || continue
+    gemset_name="$(echo "$origin_gemset" | awk -F"$rvm_gemset_separator" '{print $2}')"
+    destination_gemset="$expanded_destination"
+    if [[ -n "$gemset_name" ]]; then
+      destination_gemset="$destination_gemset$rvm_gemset_separator$gemset_name"
+    fi
+    echo "Moving $origin_gemset to $destination_gemset"
+  
+    rm -rf "$rvm_gems_path/$destination_gemset"
+    result="$?"
+    [[ "$result" -gt "0" ]] && die_with_error "Unable to remove gem directory '$rvm_gems_path/$destination_gemset'" "$result"
+    
+    mv "$rvm_gems_path/$origin_gemset" "$rvm_gems_path/$destination_gemset"
+    result="$?"
+    [[ "$result" -gt "0" ]] && die_with_error "Unable to move '$rvm_gems_path/$origin_gemset' to '$rvm_gems_path/$destination_gemset'" "$result"
+    
+    
+    echo "Making gemset $destination_gemset pristine."
+    __rvm_run_with_env "gemset.pristine" "$destination_gemset" "rvm gemset pristine"
+  done < <($rvm_scripts_path/list gemsets strings | grep "^$expanded_source")
+  unset origin_gemset destination_gemset gemset_name
+  
+  if confirm 'Do you wish to move over aliases?' ; then
+    while read -r alias_pair; do
+      migrate_ruby_name="$(echo "$alias_pair" | awk -F= '{print $2}')"
+      migrate_alias_name="$(echo "$alias_pair" | awk -F= '{print $1}')"
+      if [[ "$migrate_ruby_name" = "$expanded_source" || "$migrate_ruby_name" = "$expanded_source$rvm_gemset_separator"* ]]; then
+        migrate_new_alias_name="${migrate_ruby_name/$expanded_source/$expanded_destination}"
+        echo "Updating alias $migrate_alias_name to point to $migrate_new_alias_name"
+        $rvm_scripts_path/alias delete "$migrate_alias_name" >/dev/null 2>&1
+        $rvm_scripts_path/alias create "$migrate_alias_name" "$migrate_new_alias_name" >/dev/null 2>&1
+      fi
+    done < "$rvm_config_path/alias"
+    unset migrate_ruby_name migrate_alias_name migrate_new_alias_name
+  fi
+  
+  if confirm "Do you wish to move over wrappers?" ; then
+    origin_wrappers_path="$rvm_wrappers_path/$expanded_source"
+    for binary_name in $(\ls $rvm_bin_path) ; do
+      full_bin_path="$rvm_bin_path/$binary_name"
+      [[ ! -L "$full_bin_path" ]] && continue
+      expanded_symlink="$(readlink "$full_bin_path")"
+      [[ "$expanded_symlink" != "$origin_wrappers_path/"* ]] && continue
+      linked_binary_name="$(basename "$expanded_symlink")"
+      [[ "$binary_name" = "$linked_binary_name-$expanded_source" || "$binary_name" = "$expanded_source" ]] && continue
+      new_wrapper_destination="${expanded_symlink/$expanded_source/$expanded_destination}"
+      ln -sf "$new_wrapper_destination" "$full_bin_path"
+    done
+    unset origin_wrappers_path full_bin_path expanded_symlink linked_binary_name new_wrapper_destination
+  fi
+ 
+  if confirm "Do you also wish to completely remove $expanded_source (inc. archive)?" ; then
+    __rvm_run_with_env "rvm.remove" "$expanded_source" "rvm remove $expanded_source --archive --gems"
+  fi
+  
+  echo "Successfully migrated $expanded_source to $expanded_destination"
+  
+}
+
+if [[ -z "$1" || "$#" != 2 ]]; then
+  usage
+fi
+
+source_ruby="$1"; shift
+destination_ruby="$1"; shift
+
+migrate_rubies

data/scripts/repair

@@ -27,7 +27,7 @@ repair_environments() {
     [[ -L "$rvm_environments_path/$environment_name" ]] && continue
     $rvm_scripts_path/log "info" "Regenerating environment file for '$environment_name'"
     [[ -f "$rvm_environments_path/$environment_name" ]] && rm -f "$rvm_environments_path/$environment_name"
-    (source "$rvm_scripts_path/base"; __rvm_become "$environment_name"; __rvm_ensure_has_enviroment_files)
+    (source "$rvm_scripts_path/base"; __rvm_become "$environment_name"; __rvm_ensure_has_environment_files)
   done; unset environment_name
 }
 

data/scripts/rvm

@@ -23,60 +23,44 @@ if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
   fi
 
   # Set the default sandboxed value.
-  if [[ -z "$rvm_sandboxed" ]]; then
+  if [[ -z "$rvm_selfcontained" ]]; then
     if [[ "root" = "$(whoami)" ]] || [[ -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
-      rvm_sandboxed=0
+      rvm_selfcontained=0
     else
-      rvm_sandboxed=1
+      rvm_selfcontained=1
     fi
   fi
 
   if [[ -z "$rvm_prefix" ]] ; then
-    if [[ "$rvm_sandboxed" = "0" ]] ; then
-      rvm_prefix="/usr/local"
+    if [[ "$rvm_selfcontained" = "0" ]] ; then
+      rvm_prefix="/usr/local/"
     else
       rvm_prefix="$HOME/."
     fi
   fi
 
-  if [[ -z "$rvm_path" ]] ; then
-    unset rvm_path
-    if  [[ "$rvm_sandboxed" = "0" ]] ; then
-      rvm_path="$rvm_prefix/rvm"
-    else
-      if [[ -d "$HOME/.rvm" ]] && [[ -s "$HOME/.rvm/scripts/rvm" ]]; then
-        rvm_path="$HOME/.rvm"
-      elif [[ -d "$rvm_prefix/rvm" ]] && [[ -s "$rvm_prefix/rvm/scripts/rvm" ]] ; then
-        rvm_path="$rvm_prefix/rvm"
-      else
-        rvm_path="$HOME/.rvm"
-      fi
-    fi
+  # Fix rvm_prefix changes.
+  echo "$rvm_prefix" | grep -vq '\(\/\|\.\)$' && [[ -d "$rvm_prefix/rvm/scripts" ]]
+  rvm_prefix_needs_trailing_slash="$?"
+  if [[ "$rvm_prefix" = "/usr/local" || "$rvm_prefix_needs_trailing_slash" = "0" ]]; then
+    rvm_prefix="$rvm_prefix/"
   fi
+  unset rvm_prefix_needs_trailing_slash
 
-  if [[ -z "$rvm_scripts_path" ]] || [[ ! -d "$rvm_scripts_path" ]] ; then
-    if [[ -d "$HOME/.rvm/scripts" ]] && [[ -s "$HOME/.rvm/scripts/rvm" ]]; then
-      rvm_scripts_path="$HOME/.rvm/scripts"
-    elif [[ -d "$rvm_path/scripts" ]] && [[ -s "$rvm_path/scripts/rvm" ]]; then
-      rvm_scripts_path="$rvm_path/scripts"
-    else
-      if [[ "$rvm_sandboxed" = "0" ]] ; then
-        rvm_scripts_path="/usr/local/rvm"
-      else
-        rvm_scripts_path="$HOME/.rvm"
-      fi
-    fi
+  if [[ -z "$rvm_path" ]] ; then
+    rvm_path="${rvm_prefix}rvm"
   fi
+  rvm_scripts_path="${rvm_scripts_path:-"$rvm_path/scripts"}"
 
   if [[ -d "$rvm_path" ]] ; then
-    source $rvm_scripts_path/array
-    source $rvm_scripts_path/utility
-    source $rvm_scripts_path/initialize
-    source $rvm_scripts_path/version
-    source $rvm_scripts_path/selector
-    source $rvm_scripts_path/cli
-    source $rvm_scripts_path/manpages
-    source $rvm_scripts_path/cd
+    source "$rvm_scripts_path/array"
+    source "$rvm_scripts_path/utility"
+    source "$rvm_scripts_path/initialize"
+    source "$rvm_scripts_path/version"
+    source "$rvm_scripts_path/selector"
+    source "$rvm_scripts_path/cli"
+    source "$rvm_scripts_path/manpages"
+    source "$rvm_scripts_path/cd"
 
     rvm_loaded_flag=1
 

data/scripts/rvm-install

@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 
-if [[ -z "$rvm_sandboxed" ]]; then
+if [[ -z "$rvm_selfcontained" ]]; then
   if [[ "root" = "$(whoami)" ]] || [[ -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
-    export rvm_sandboxed=0
+    export rvm_selfcontained=0
   else
-    export rvm_sandboxed=1
+    export rvm_selfcontained=1
   fi
 fi
 
@@ -61,7 +61,7 @@ done
 
 if [[ -z "$rvm_prefix" ]] ; then
   __rvm_load_rvmrc
-  if [[ "$rvm_sandboxed" = "0" ]] ; then
+  if [[ "$rvm_selfcontained" = "0" ]] ; then
     rvm_prefix="${rvm_prefix:-"/usr/local/"}"
   else
     rvm_prefix="${rvm_prefix:-"$HOME/."}"
@@ -95,10 +95,14 @@ rvm_archives_path="${rvm_archives_path:-"$rvm_path/archives"}"
 rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
 rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"
 
-if [[ -z "$rvm_prefix" ]] && [[ "root" = "$(whoami)" ]] ; then
-  rvm_bin_path="${rvm_bin_path:-"/usr/local/bin"}"
+if [[ "$rvm_selfcontained" = "0" ]] ; then
+  rvm_bin_path="${rvm_bin_path:-"$rvm_prefix/bin"}"
+  rvm_man_path="${rvm_man_path:-"$rvm_prefix/share/man"}"
+  rvm_rc_files="${rvm_rc_files:-"/etc/profile /etc/zshenv"}"
 else
+  rvm_man_path="${rvm_man_path:-"$rvm_path/man"}"
   rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
+  rvm_rc_files="${rvm_rc_files:-"$HOME/.bash_profile $HOME/.bashrc $HOME/.zshenv"}"
 fi
 
 rvm_gems_path="${rvm_gems_path:-"$rvm_path/gems"}"
@@ -321,8 +325,8 @@ else
     printf "\n     [[ -s \$HOME/.rvm/scripts/rvm ]] && source \$HOME/.rvm/scripts/rvm"
     printf "\n   Please note that this must only occur once - so, you only need to add it the first time you install rvm."
     printf "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
-    printf "\n   This means that if you see '[ -z "\$PS1" ] && return' then you must change this line to:"
-    printf "\n   if [[ -n "\$PS1" ]] ; then"
+    printf "\n   This means that if you see '[ -z \"\$PS1\" ] && return' then you must change this line to:"
+    printf "\n   if [[ -n \"\$PS1\" ]] ; then"
     printf "\n     ... original content that was below the && return line ..."
     printf "\n   fi # <= be sure to close the if."
     printf "\n   #EOF .bashrc"
@@ -331,10 +335,10 @@ else
     printf "\n   placing all non-interactive items in the .bashrc, including the 'source' line above"
     printf "\n3) Then $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
   fi
-  if [[ -s $HOME/.bashrc ]] && grep -q '&& return' $HOME/.bashrc ; then
+  if [[ -s "$HOME/.bashrc" ]] && grep -q '&& return' "$HOME/.bashrc" ; then
     printf "\n\nWARNING:  you have a 'return' statement in your .bashrc, likely this will cause untold havoc."
-    printf "\n   This means that if you see '[ -z "\$PS1" ] && return' then you must change this line to:"
-    printf "\n   if [[ -n "\$PS1" ]] ; then"
+    printf "\n   This means that if you see '[ -z \"\$PS1\" ] && return' then you must change this line to:"
+    printf "\n   if [[ -n \"\$PS1\" ]] ; then"
     printf "\n     ... original content that was below the && return line ..."
     printf "\n   fi # <= be sure to close the if."
     printf "\n   #EOF .bashrc"

data/scripts/selector

@@ -219,7 +219,8 @@ __rvm_select() {
 }
 
 __rvm_use() {
-  if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
+  
+  if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select "$@" ; fi
   if [[ -z "$rvm_ruby_interpreter" ]] ; then rvm_ruby_interpreter="system" ; fi
 
   if [[ "system" = "$rvm_ruby_interpreter" ]] ; then
@@ -237,7 +238,7 @@ __rvm_use() {
     fi
 
     # Check binaries, remove under the condition they're symlinks.
-    if [[ "$rvm_sandboxed" = "0" ]] ; then
+    if [[ "$rvm_selfcontained" = "0" ]] ; then
       for binary in ruby gem irb ri rdoc rake erb testrb ; do
         full_binary_path="$rvm_bin_path/$binary"
         [[ -L "$full_binary_path" ]] && rm -f "$full_binary_path"
@@ -273,7 +274,7 @@ __rvm_use() {
     fi
 
     # Ensure the environment file for the selected ruby exists.
-    __rvm_ensure_has_enviroment_files
+    __rvm_ensure_has_environment_files
 
     if [[ ! -z "$rvm_verbose_flag" ]] ; then
       $rvm_scripts_path/log "info" "Using $(basename $GEM_HOME | \tr '-' ' ' | sed 's/'${rvm_gemset_separator}'/ with gemset /')"
@@ -284,15 +285,15 @@ __rvm_use() {
   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
+  if [[ -n "$rvm_ruby_string" ]]  ; then export rvm_ruby_string  ; fi
+  if [[ -n "$rvm_gemset_name" ]]  ; then export rvm_gemset_name ; fi
+  if [[ -n "$new_path" ]]         ; then export PATH="$new_path" ; unset new_path ; fi
+  if [[ -n "$rvm_rvmrc_flag" ]]   ; then __rvm_set_rvmrc ; fi
 
   environment_id="$(__rvm_environment_identifier)"
 
   if [[ ! -z "$rvm_default_flag" ]] && [[ "default" != "$rvm_ruby_interpreter" ]] ; then
-    if [[ "$rvm_sandboxed" = "0" ]] ; then
+    if [[ "$rvm_selfcontained" = "0" ]] ; then
       # Sets up the default wrappers.
       $rvm_scripts_path/wrapper "$rvm_ruby_string"
     fi
@@ -312,11 +313,18 @@ __rvm_use() {
     fi
   fi ; unset rvm_default_flag
 
-  if [[ ! -z "$rvm_wrapper_name" ]] ; then
+  if [[ -n "$rvm_wrapper_name" ]] ; then
     $rvm_scripts_path/wrapper "$environment_id" "$rvm_wrapper_name" > /dev/null 2>&1
     unset rvm_wrapper_name
   fi
 
+  if [[ -n "$rvm_ruby_alias" ]]; then
+    $rvm_scripts_path/log "info" "Attempting to alias $environment_id to $rvm_ruby_alias"
+    $rvm_scripts_path/alias delete "$rvm_ruby_alias" > /dev/null 2>&1
+    rvm_alias_expanded=1 $rvm_scripts_path/alias create "$rvm_ruby_alias" "$environment_id" > /dev/null 2>&1
+    unset ruby_alias rvm_ruby_alias
+  fi
+
   unset environment_id
 
   if [[ "maglev" = "$rvm_ruby_interpreter" ]] ; then
@@ -352,10 +360,6 @@ __rvm_ruby_string() {
     fi
   fi
 
-  # Preparation for alias tags
-  rvm_ruby_alias=$(echo "$rvm_ruby_string" | awk -F+ '{print $2}')
-  rvm_ruby_string=$(echo "$rvm_ruby_string" | awk -F+ '{print $1}')
-
   set_name=$(echo "$rvm_ruby_string" | awk -F${rvm_gemset_separator} '{print $2}')
   if [[ ! -z "$set_name" ]] ; then rvm_gemset_name="$set_name" ; fi
   ruby_string=$(echo "$rvm_ruby_string" | awk -F${rvm_gemset_separator} '{print $1}')
@@ -490,10 +494,6 @@ __rvm_gemset_select() {
 
   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.
@@ -570,9 +570,6 @@ __rvm_gemset_select() {
 
 # 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 [[ -n "$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

data/scripts/set

@@ -159,8 +159,7 @@ __rvm_json() {
 
 rubies=() ; successes=() ; errors=() ; statuses=()
 
-rvm_ruby_strings="${rvm_ruby_strings:-"$($rvm_scripts_path/list strings)"}"
-rvm_ruby_strings="$(echo "$rvm_ruby_strings" | \tr ',' ' ')"
+rvm_ruby_strings="$(__rvm_expand_ruby_string "$rvm_ruby_strings")"
 
 # Check for a single ruby && exec if present.
 __rvm_attempt_single_exec

data/scripts/update

@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 
-if [[ -z "$rvm_sandboxed" ]]; then
+if [[ -z "$rvm_selfcontained" ]]; then
   if [[ "root" = "$(whoami)" ]] || [[ -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
-    export rvm_sandboxed=0
+    export rvm_selfcontained=0
   else
-    export rvm_sandboxed=1
+    export rvm_selfcontained=1
   fi
 fi
 
@@ -61,7 +61,7 @@ done
 
 if [[ -z "$rvm_prefix" ]] ; then
   __rvm_load_rvmrc
-  if [[ "$rvm_sandboxed" = "0" ]] ; then
+  if [[ "$rvm_selfcontained" = "0" ]] ; then
     rvm_prefix="${rvm_prefix:-"/usr/local/"}"
   else
     rvm_prefix="${rvm_prefix:-"$HOME/."}"
@@ -95,10 +95,14 @@ rvm_archives_path="${rvm_archives_path:-"$rvm_path/archives"}"
 rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
 rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"
 
-if [[ -z "$rvm_prefix" ]] && [[ "root" = "$(whoami)" ]] ; then
-  rvm_bin_path="${rvm_bin_path:-"/usr/local/bin"}"
+if [[ "$rvm_selfcontained" = "0" ]] ; then
+  rvm_bin_path="${rvm_bin_path:-"$rvm_prefix/bin"}"
+  rvm_man_path="${rvm_man_path:-"$rvm_prefix/share/man"}"
+  rvm_rc_files="${rvm_rc_files:-"/etc/profile /etc/zshenv"}"
 else
+  rvm_man_path="${rvm_man_path:-"$rvm_path/man"}"
   rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
+  rvm_rc_files="${rvm_rc_files:-"$HOME/.bash_profile $HOME/.bashrc $HOME/.zshenv"}"
 fi
 
 rvm_gems_path="${rvm_gems_path:-"$rvm_path/gems"}"
@@ -321,8 +325,8 @@ else
     printf "\n     [[ -s \$HOME/.rvm/scripts/rvm ]] && source \$HOME/.rvm/scripts/rvm"
     printf "\n   Please note that this must only occur once - so, you only need to add it the first time you install rvm."
     printf "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
-    printf "\n   This means that if you see '[ -z "\$PS1" ] && return' then you must change this line to:"
-    printf "\n   if [[ -n "\$PS1" ]] ; then"
+    printf "\n   This means that if you see '[ -z \"\$PS1\" ] && return' then you must change this line to:"
+    printf "\n   if [[ -n \"\$PS1\" ]] ; then"
     printf "\n     ... original content that was below the && return line ..."
     printf "\n   fi # <= be sure to close the if."
     printf "\n   #EOF .bashrc"
@@ -331,10 +335,10 @@ else
     printf "\n   placing all non-interactive items in the .bashrc, including the 'source' line above"
     printf "\n3) Then $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
   fi
-  if [[ -s $HOME/.bashrc ]] && grep -q '&& return' $HOME/.bashrc ; then
+  if [[ -s "$HOME/.bashrc" ]] && grep -q '&& return' "$HOME/.bashrc" ; then
     printf "\n\nWARNING:  you have a 'return' statement in your .bashrc, likely this will cause untold havoc."
-    printf "\n   This means that if you see '[ -z "\$PS1" ] && return' then you must change this line to:"
-    printf "\n   if [[ -n "\$PS1" ]] ; then"
+    printf "\n   This means that if you see '[ -z \"\$PS1\" ] && return' then you must change this line to:"
+    printf "\n   if [[ -n \"\$PS1\" ]] ; then"
     printf "\n     ... original content that was below the && return line ..."
     printf "\n   fi # <= be sure to close the if."
     printf "\n   #EOF .bashrc"