rvm 0.1.41 → 0.1.42

data/scripts/rvm-install

@@ -44,19 +44,19 @@ if echo "$*" | grep -q 'trace' ; then echo "$*" ; env | grep '^rvm_' ; set -x ;
 while [[ $# -gt 0 ]] ; do
   token="$1" ; shift
   case "$token" in
-    --auto)    rvm_auto_flag=1          ;;
+    --auto)    rvm_auto_flag=1 ;;
     --prefix)  rvm_prefix="$1" ; shift ;;
     --version) rvm_path="$(pwd)" ; __rvm_version ; unset rvm_path ; exit ;;
-    --help|*)  usage                    ;;
+    --help|*)  usage ;;
   esac
 done
 
 if [[ -z "$rvm_prefix" ]] ; then
   __rvm_load_rvmrc
   if [[ "root" = "$(whoami)" ]] ; then
-    rvm_prefix="/usr/local/"
+    rvm_prefix="${rvm_prefix:-"/usr/local/"}"
   else
-    rvm_prefix="$HOME/."
+    rvm_prefix="${rvm_prefix:-"$HOME/."}"
   fi
 fi
 
@@ -87,7 +87,7 @@ 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 [[ "root" = "$(whoami)" ]] ; then
+if [[ -z "$rvm_prefix" ]] && [[ "root" = "$(whoami)" ]] ; then
   rvm_bin_path="${rvm_bin_path:-"/usr/local/bin"}"
 else
   rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
@@ -114,7 +114,7 @@ fi
 
 spinner
 
-mkdir -p $rvm_archives_path $rvm_src_path $rvm_log_path $rvm_bin_path $rvm_gems_path $rvm_rubies_path $rvm_config_path $rvm_hooks_path $rvm_tmp_path
+mkdir -p $rvm_archives_path $rvm_src_path $rvm_log_path $rvm_bin_path $rvm_gems_path $rvm_rubies_path $rvm_config_path $rvm_hooks_path $rvm_patches_path $rvm_tmp_path
 
 for file in README LICENCE ; do
   spinner
@@ -139,7 +139,7 @@ if [[ ! -s "$rvm_config_path/user" ]] ; then
 fi
 
 scripts=("monitor" "match" "log" "install" "color" "db" "fetch" "log" "set" "package")
-for script_name in $scripts ; do
+for script_name in "${scripts[@]}" ; do
   spinner
   chmod +x $rvm_scripts_path/$script_name
 done
@@ -148,7 +148,7 @@ done
 # Bin Scripts
 #
 # Cleanse and purge...
-for file in rvm-prompt rvm rvmsudo ; do
+for file in rvm-prompt rvm rvmsudo rvm-shell ; do
   spinner && perl -e 'sleep 0.2'
   rm -f "$rvm_bin_path/$file"
   cp -f "$source_path/binscripts/$file" $rvm_bin_path/
@@ -160,7 +160,7 @@ chmod +x $rvm_bin_path/*
 # RC Files
 #
 spinner
-if [[ ! -z "$rvm_auto_flag" ]] ; then
+if [[ -n "$rvm_auto_flag" ]] ; then
   printf "Checking rc files... ($rvm_rc_files)"
   if [[ "$rvm_loaded_flag" != "1" ]] ; then
     for rcfile in $(echo $rvm_rc_files) ; do
@@ -274,16 +274,16 @@ fi
 # End of gemset migration.
 #
 
-if [[ "root" = "$(whoami)" ]] ; then
-  printf "\n    Symlinking rvm to $rvm_bin_path/rvm ..."
-  mkdir -p $rvm_bin_path
-  chmod +x $rvm_bin_path/rvm
-  chmod +x $rvm_bin_path/rvmsudo
-  printf "\n    Copying manpages into place."
-  for man_file in $(\ls "$install_source_path/man"); do
-    cp -f "$install_source_path/man/$man_file" "$rvm_man_path/$man_file"
-  done
-fi
+printf "\n    Correct permissions for base binaries in $rvm_bin_path..."
+mkdir -p $rvm_bin_path
+for file in rvm rvmsudo rvm-shell ; do
+  [[ -s "$rvm_bin_path/$file" ]] && chmod +x "$rvm_bin_path/$file"
+done; unset file
+printf "\n    Copying manpages into place."
+for man_file in $(\ls "$install_source_path/man"); do
+  rm -rf "$rvm_man_path/$man_file"
+  cp -R "$install_source_path/man/$man_file" "$rvm_man_path/"
+done
 
 if [[ "$upgrade_flag" -eq 0 ]] ; then
   ./scripts/notes
@@ -303,20 +303,19 @@ if [[ "$upgrade_flag" -eq 1 ]] ; then
   printf "\n$(tput setaf 6)Upgrade Notes\n"
   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"
   check_rubyopt_conditions
   printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"
 else
-  if [[ "root" != "$(whoami)" ]] ; then
+  if [[ -z "$rvm_prefix" ]] && [[ "root" != "$(whoami)" ]] ; then
     printf "\n$(tput setaf 1)You must now finish the install manually:$(tput sgr0)"
     printf "\n1) Place the folowing line at the end of your shell's loading files(.bashrc or .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
     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 [[ ! -z "$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"
@@ -325,7 +324,7 @@ 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 '&& 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"

data/scripts/selector

@@ -303,8 +303,8 @@ __rvm_use() {
 
   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
+      # Sets up the default wrappers.
+      $rvm_scripts_path/wrapper "$rvm_ruby_string"
     fi
     if [[ "system" = "$rvm_ruby_interpreter" ]] ; then
       $rvm_scripts_path/alias delete default &> /dev/null

data/scripts/tools

@@ -0,0 +1,34 @@
+source "$rvm_scripts_path/base"
+
+usage() {
+  echo "Usage: rvm tools {identifier,path-identifier}" 1>&2
+  exit 1
+}
+
+# Return the identifier that's current in use.
+tools_identifier() {
+  __rvm_environment_identifier
+}
+
+tools_path_identifier() {
+  if [[ -z "$1" || ! -d "$1" ]]; then
+    echo "Usage: rvm tools path-identifier 'path-to-heck'"
+    return 1
+  fi
+  # Change to the directory. Do in subshell to keep the env correct.
+  (source $rvm_scripts_path/rvm
+   cd "$1" >/dev/null 2>&1
+    __rvm_environment_identifier)
+}
+
+[[ -z "$1" ]] && usage
+
+action="$1"; shift
+
+case "$action" in
+  identifier)      tools_identifier ;;
+  path-identifier) tools_path_identifier "$@" ;;
+  *)               usage ;;
+esac
+
+exit $?

data/scripts/update

@@ -44,19 +44,19 @@ if echo "$*" | grep -q 'trace' ; then echo "$*" ; env | grep '^rvm_' ; set -x ;
 while [[ $# -gt 0 ]] ; do
   token="$1" ; shift
   case "$token" in
-    --auto)    rvm_auto_flag=1          ;;
+    --auto)    rvm_auto_flag=1 ;;
     --prefix)  rvm_prefix="$1" ; shift ;;
     --version) rvm_path="$(pwd)" ; __rvm_version ; unset rvm_path ; exit ;;
-    --help|*)  usage                    ;;
+    --help|*)  usage ;;
   esac
 done
 
 if [[ -z "$rvm_prefix" ]] ; then
   __rvm_load_rvmrc
   if [[ "root" = "$(whoami)" ]] ; then
-    rvm_prefix="/usr/local/"
+    rvm_prefix="${rvm_prefix:-"/usr/local/"}"
   else
-    rvm_prefix="$HOME/."
+    rvm_prefix="${rvm_prefix:-"$HOME/."}"
   fi
 fi
 
@@ -87,7 +87,7 @@ 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 [[ "root" = "$(whoami)" ]] ; then
+if [[ -z "$rvm_prefix" ]] && [[ "root" = "$(whoami)" ]] ; then
   rvm_bin_path="${rvm_bin_path:-"/usr/local/bin"}"
 else
   rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
@@ -114,7 +114,7 @@ fi
 
 spinner
 
-mkdir -p $rvm_archives_path $rvm_src_path $rvm_log_path $rvm_bin_path $rvm_gems_path $rvm_rubies_path $rvm_config_path $rvm_hooks_path $rvm_tmp_path
+mkdir -p $rvm_archives_path $rvm_src_path $rvm_log_path $rvm_bin_path $rvm_gems_path $rvm_rubies_path $rvm_config_path $rvm_hooks_path $rvm_patches_path $rvm_tmp_path
 
 for file in README LICENCE ; do
   spinner
@@ -139,7 +139,7 @@ if [[ ! -s "$rvm_config_path/user" ]] ; then
 fi
 
 scripts=("monitor" "match" "log" "install" "color" "db" "fetch" "log" "set" "package")
-for script_name in $scripts ; do
+for script_name in "${scripts[@]}" ; do
   spinner
   chmod +x $rvm_scripts_path/$script_name
 done
@@ -148,7 +148,7 @@ done
 # Bin Scripts
 #
 # Cleanse and purge...
-for file in rvm-prompt rvm rvmsudo ; do
+for file in rvm-prompt rvm rvmsudo rvm-shell ; do
   spinner && perl -e 'sleep 0.2'
   rm -f "$rvm_bin_path/$file"
   cp -f "$source_path/binscripts/$file" $rvm_bin_path/
@@ -160,7 +160,7 @@ chmod +x $rvm_bin_path/*
 # RC Files
 #
 spinner
-if [[ ! -z "$rvm_auto_flag" ]] ; then
+if [[ -n "$rvm_auto_flag" ]] ; then
   printf "Checking rc files... ($rvm_rc_files)"
   if [[ "$rvm_loaded_flag" != "1" ]] ; then
     for rcfile in $(echo $rvm_rc_files) ; do
@@ -274,16 +274,16 @@ fi
 # End of gemset migration.
 #
 
-if [[ "root" = "$(whoami)" ]] ; then
-  printf "\n    Symlinking rvm to $rvm_bin_path/rvm ..."
-  mkdir -p $rvm_bin_path
-  chmod +x $rvm_bin_path/rvm
-  chmod +x $rvm_bin_path/rvmsudo
-  printf "\n    Copying manpages into place."
-  for man_file in $(\ls "$install_source_path/man"); do
-    cp -f "$install_source_path/man/$man_file" "$rvm_man_path/$man_file"
-  done
-fi
+printf "\n    Correct permissions for base binaries in $rvm_bin_path..."
+mkdir -p $rvm_bin_path
+for file in rvm rvmsudo rvm-shell ; do
+  [[ -s "$rvm_bin_path/$file" ]] && chmod +x "$rvm_bin_path/$file"
+done; unset file
+printf "\n    Copying manpages into place."
+for man_file in $(\ls "$install_source_path/man"); do
+  rm -rf "$rvm_man_path/$man_file"
+  cp -R "$install_source_path/man/$man_file" "$rvm_man_path/"
+done
 
 if [[ "$upgrade_flag" -eq 0 ]] ; then
   ./scripts/notes
@@ -303,20 +303,19 @@ if [[ "$upgrade_flag" -eq 1 ]] ; then
   printf "\n$(tput setaf 6)Upgrade Notes\n"
   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"
   check_rubyopt_conditions
   printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"
 else
-  if [[ "root" != "$(whoami)" ]] ; then
+  if [[ -z "$rvm_prefix" ]] && [[ "root" != "$(whoami)" ]] ; then
     printf "\n$(tput setaf 1)You must now finish the install manually:$(tput sgr0)"
     printf "\n1) Place the folowing line at the end of your shell's loading files(.bashrc or .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
     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 [[ ! -z "$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"
@@ -325,7 +324,7 @@ 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 '&& 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"

data/scripts/utility

@@ -24,6 +24,17 @@ __rvm_teardown() {
   # Ruby strings are scoped to their action.
   # Hence, we ensure we remove them at in
   # the cleanup phase.
+  
+  # Clean up after CC switch
+  if [[ -n "$rvm_clang_flag" ]] ; then
+    if [[ -n "$rvm_prior_cc" ]] ; then
+      export CC="$rvm_prior_cc"
+    else
+      unset CC
+    fi
+    unset rvm_prior_cc
+  fi
+  
   unset rvm_ruby_strings
 }
 
@@ -65,8 +76,8 @@ is_a_function() { type $1 | head -n 1 | grep -q "function" ; }
 __rvm_quote_args() {
   local quoted_string=""
   for quoted_argument in "$@"; do
-    if echo "$quoted_argument" | grep -q " "; then
-      quoted_string="$quoted_string '$(echo "$quoted_argument" | sed "s/'/\\\'/g")'"
+    if printf "%s" "$quoted_argument" | grep -vq "^[[:alnum:]]$"; then
+      quoted_string="$quoted_string '$(printf "%s" "$quoted_argument" | sed "s/'/\'\\\'\'/g")'"
     else
       quoted_string="$quoted_string $quoted_argument"
     fi
@@ -169,7 +180,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_sticky_flag rvm_rvmrc_flag rvm_gems_flag rvm_only_path_flag rvm_docs_flag rvm_ruby_aliases rvm_ruby_aliases rvm_patch_names
+  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_sticky_flag rvm_rvmrc_flag rvm_gems_flag rvm_only_path_flag rvm_docs_flag rvm_ruby_aliases rvm_ruby_aliases rvm_patch_names rvm_clang_flag
 }
 
 # Unset ruby-specific variables
@@ -498,9 +509,9 @@ __rvm_make_flags() {
     # \ls /usr/lib/gcc/x86_64-apple-darwin10
 
     # Set the build & host type
-    if [[ "Power Macintosh" = "$(sysctl hw.machine | awk -F: '{print $2}' | sed 's/^ //')" ]] ; then
+    if [[ "Power Macintosh" = "$(sysctl -n hw.machine)" ]] ; then
       : # Do nothing ?
-    elif [[ $(sysctl hw.cpu64bit_capable | awk '{print $2}') = 1 ]] ; then # we could also use: sysctl hw.optional.x86_64
+    elif [[ "$(sysctl -n hw.cpu64bit_capable)" = 1 || "$(sysctl -n hw.optional.x86_64)" = 1 ]] ; then 
       #   64 bit capable
       if [[ "-arch x86_64" = "$rvm_archflags" ]] ; then
         rvm_ruby_configure_flags="${rvm_ruby_configure_flags} --build=x86_64-apple-darwin$(uname -r) --host=x86_64-apple-darwin$(uname -r)"
@@ -510,10 +521,6 @@ __rvm_make_flags() {
         rvm_archflags="-arch x86_64"
         rvm_ruby_configure_flags="${rvm_ruby_configure_flags} --build=x86_64-apple-darwin$(uname -r) --host=x86_64-apple-darwin$(uname -r)"
       fi
-    else
-      #   32 bit capable only
-      if [[ -z "$rvm_archflags" ]] ; then rvm_archflags="-arch i386" ; fi
-      rvm_ruby_configure_flags="${rvm_ruby_configure_flags} --build=i386-apple-darwin$(uname -r) --host=i386-apple-darwin$(uname -r)"
     fi
 
     if [[ ! -z "$rvm_archflags" ]] ; then
@@ -705,14 +712,16 @@ __rvm_ensure_has_enviroment_files() {
   fi ; unset file_name
   # Next, ensure we have default wrapper files. Also, prevent it from recursing.
   if [[ -z "$rvm_creating_default_wrappers" ]]; then
+    # We need to generate wrappers for both the default gemset and the global gemset.
+    for wrapper_identifier in "$environment_identifier" "${environment_identifier}@global" ; do
     rvm_creating_default_wrappers=1
-    directory_name="$rvm_wrappers_path/$environment_identifier"
+    directory_name="$rvm_wrappers_path/$wrapper_identifier"
     if [[ ! -L "$directory_name" && ! -d "$directory_name" ]]; then
       mkdir -p "$directory_name"
-      # Install the default wrappers.
-      $rvm_scripts_path/wrapper "$environment_identifier" &> /dev/null
+      $rvm_scripts_path/wrapper "$wrapper_identifier" &> /dev/null
     fi
     unset rvm_creating_default_wrappers directory_name
+    done; unset wrapper_identifier
   fi
 }
 
@@ -744,3 +753,36 @@ __rvm_ultimate_question() {
   printf "\nUltimate Question."
 }
 
+# Checks the rvmrc for the given directory. Note that if
+# argument is passed, it will be used instead of pwd.
+__rvm_project_rvmrc() {
+  local cwd
+  # Get the first argument or the pwd.
+  cwd="${1:-"$(pwd)"}"
+  while : ; do
+    if [[ -z "$cwd" ]] || [[ "$HOME" = "$cwd" ]] || [[ "/" = "$cwd" ]] ; then
+      if [[ -n "$rvm_rvmrc_cwd" ]] ; then
+        if [[ -z "$rvm_previous_environment" ]] ; then
+          rvm default 1>/dev/null 2>&1
+        else
+          rvm "$rvm_previous_environment"  1>/dev/null 2>&1
+        fi
+        unset rvm_rvmrc_cwd rvm_previous_environment
+      fi
+      break
+    else
+      if [[ -f "$cwd/.rvmrc" ]] ; then
+        if [[ "$rvm_rvmrc_cwd" != "$cwd" ]] ; then
+          if [[ -z "$rvm_previous_environment" ]] ; then
+            rvm_previous_environment="$(__rvm_environment_identifier)"
+          fi
+          rvm_rvmrc_cwd="$cwd"
+          source "$cwd/.rvmrc"
+        fi
+        break
+      else
+        cwd=$(dirname "$cwd")
+      fi
+    fi
+  done
+}

data/scripts/wrapper

@@ -28,18 +28,21 @@ wrap() {
 
 symlink_binary() {
   # Generate the default wrapper with the given binary name.
-  wrap_binary # Note, now forcing this every time to force clean.
-  # Then symlink it into place.
-  rm -f "${rvm_bin_path}/${prefix}_${binary_name}"
-  ln -fs "$file_name" "${rvm_bin_path}/${prefix}_${binary_name}"
+  # We first check if we can wrap the binary and if we were able to,
+  # we then symlink it into place.
+  if wrap_binary && [[ -f "$file_name" ]]; then
+    rm -f "${rvm_bin_path}/${prefix}_${binary_name}"
+    ln -fs "$file_name" "${rvm_bin_path}/${prefix}_${binary_name}"
+  fi
 }
 
 wrap_binary() {
-  # Iff the command is found in the path.
-  if command -v $binary_name > /dev/null; then
+  # We wrap when the given binary is in the path or override_check is set to one.
+  if [[ "$override_check" = "1" ]] || command -v $binary_name > /dev/null; then
     wrap
   else
     $rvm_scripts_path/log "error" "Binary '$binary_name' not found in path."
+    return 1
   fi
 }
 
@@ -58,8 +61,9 @@ fi
 
 ruby_string="$1"; shift
 
+override_check=0
 prefix="$1"
-if [[ -n "$1" ]]; then shift; fi
+[[ "$#" -gt 0 ]] && shift
 
 binaries="$(echo "$@" | __rvm_strip)"
 
@@ -85,19 +89,18 @@ environment_identifier="$(__rvm_environment_identifier)"
 for binary_name in $binaries; do
   file_name="${rvm_wrappers_path}/${environment_identifier}/${binary_name}"
   if [[ -z "$prefix" ]] ; then
+    override_check=1
     wrap_binary
     # Symlink it into place.
-    if [[ "$binary_name" == "ruby" ]] ; then
-      rm -f "${rvm_bin_path}/${environment_identifier}"
-      ln -nsf "${file_name}" "${rvm_bin_path}/${environment_identifier}"
-    else
-      rm -f "${rvm_bin_path}/${binary_name}-${environment_identifier}"
-      ln -nsf "${file_name}" "${rvm_bin_path}/${binary_name}-${environment_identifier}"
-    fi
-    if [[ "root" = "$(whoami)" ]] && [[ "${default_flag}" = 1 ]] ; then
-      rm -f "${rvm_bin_path}/${binary_name}"
-      ln -nsf "${file_name}" "${rvm_bin_path}/${binary_name}"
-    fi
+    if [[ -f "$file_name" ]]; then
+      if [[ "$binary_name" == "ruby" ]] ; then
+        destination="$rvm_bin_path/$environment_identifier"
+      else
+        destination="$rvm_bin_path/${binary_name}-${environment_identifier}"
+      fi
+      rm -rf "$destination"
+      ln -nsf "$file_name" "$destination"
+    fi; unset destination
   else
     symlink_binary
   fi ; unset file_name