rvm 1.0.6 → 1.0.7

data/scripts/list

@@ -1,10 +1,8 @@
 #!/usr/bin/env bash
 
-rvm_pretty_print=${rvm_pretty_print:-0}
-
 rvm_base_except="selector"
 
-source "$rvm_scripts_path/base"
+source "$rvm_path/scripts/base"
 
 usage() {
   printf "
@@ -34,10 +32,11 @@ list_gemsets() {
 
   printf "\nrvm gemsets\n"
 
-  versions=($(builtin cd "$rvm_gems_path/" ; find * -type d -maxdepth 0 -print 2> /dev/null | awk '/[a-z]*-.*/ {print $NF}'))
-  for version in "${versions[@]}" ; do
+  versions=($(builtin cd "$rvm_gems_path/" ; find . -maxdepth 1 -mindepth 1 -type d -print 2> /dev/null | awk '/[a-z]*-.*/ {print $NF}'))
+
+  for version in "${versions[@]//.\/}" ; do
 
-    ruby_version_name="$(echo "$version" | awk -F"$rvm_gemset_separator" '{print $1}')"
+    ruby_version_name="$(echo "$version" | awk -F"${rvm_gemset_separator:-"@"}" '{print $1}')"
 
     [[ "$all_rubies" != *"$ruby_version_name"* ]] && continue
 
@@ -59,7 +58,7 @@ list_gemsets() {
       printf "   "
     fi
 
-    if [[ ${rvm_pretty_print:-0} -eq 1 ]] ; then
+    if [[ ${rvm_pretty_print_flag:-0} -eq 1 ]] ; then
 
       printf "$(tput setaf 2)$version$(tput sgr0) $string"
     else
@@ -74,15 +73,15 @@ list_gemsets() {
 
     if [[ -n "$version" ]] ; then
 
-      printf "\n\nDefault Ruby (for new shells)\n"
+      printf "\nDefault Ruby (for new shells)\n"
 
       string="[ $(file "$rvm_rubies_path/$version/bin/ruby" | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
 
-      if [[ ${rvm_pretty_print:-0} -eq 1 ]] ; then
+      if [[ ${rvm_pretty_print_flag:-0} -eq 1 ]] ; then
 
-        printf "\n  $(tput setaf 2)$version$(tput sgr0) $string"
+        printf "\n  $(tput setaf 2)$version$(tput sgr0) $string\n"
       else
-        printf "\n  $version $string"
+        printf "\n  $version $string\n"
       fi
 
     fi
@@ -100,33 +99,37 @@ list_default() {
 
   if [[ "${args[0]:-""}" = "string" ]] ; then
 
-    "$rvm_scripts_path/alias" show default 2>/dev/null | awk -F"$rvm_gemset_separator" '{print $1}' | xargs basename --
+    "$rvm_path/scripts/alias" show default 2>/dev/null | awk -F"${rvm_gemset_separator:-"@"}" '{print $1}' | xargs basename --
 
   else
     if [[ -L "$rvm_rubies_path/default" ]]; then
 
-      version=$("$rvm_scripts_path/alias" show default 2>/dev/null | awk -F"$rvm_gemset_separator" '{print $1}' | xargs basename --)
+      version=$("$rvm_path/scripts/alias" show default 2>/dev/null | awk -F"${rvm_gemset_separator:-"@"}" '{print $1}' | xargs basename --)
 
       if [[ -n "$version" ]] ; then
 
-        printf "\n\nDefault Ruby (for new shells)\n"
+        printf "\nDefault Ruby (for new shells)\n"
 
         string="[ $(file "$rvm_rubies_path/$version/bin/ruby" | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | \tr "\n" ' ')]"
 
-        if [[ ${rvm_pretty_print:-0} -eq 1 ]] ; then
+        if [[ ${rvm_pretty_print_flag:-0} -eq 1 ]] ; then
 
           printf "\n   $(tput setaf 2)$version$(tput sgr0) $string\n"
+
         else
           printf "\n   $version $string\n"
         fi
-      fi ; unset version
+      fi
     fi
   fi
 
+  printf "\n"
+
   return 0
 }
 
 list_ruby_svn_tags() {
+
   local prefix tag
 
   while read -r tag
@@ -143,10 +146,11 @@ list_ruby_svn_tags() {
 # Query for valid rvm ruby strings
 # This is meant to be used with scripting.
 list_strings() {
+
   (
   cd "$rvm_rubies_path"
 
-  find * -type d -maxdepth 0
+  find . -maxdepth 1 -mindepth 1 -type d | sed -e 's#./##g'
   )
 
   return $?
@@ -154,15 +158,16 @@ list_strings() {
 
 # This is meant to be used with scripting.
 list_gemset_strings() {
+
   local all_rubies ruby_name gemset gemsets
 
   all_rubies="$(list_strings)"
 
-  gemsets=($(builtin cd "$rvm_gems_path" ; find * -type d -maxdepth 0 2>/dev/null | xargs -n1 basename -- | \grep -v '^\(@\|doc$\|cache$\|system$\)' | sort))
+  gemsets=($(builtin cd "$rvm_gems_path" ; find . -maxdepth 1 -mindepth 1 -type d 2>/dev/null | xargs -n1 basename -- | \grep -v '^\(@\|doc$\|cache$\|system$\)' | sort))
 
-  for gemset in "${gemsets[@]}" ; do
+  for gemset in "${gemsets[@]//.\/}" ; do
 
-    ruby_name="${gemset//${rvm_gemset_separator}*}"
+    ruby_name="${gemset//${rvm_gemset_separator:-"@"}*}"
 
     [[ "$all_rubies" != *"$ruby_name"* ]] && continue
 
@@ -175,7 +180,7 @@ list_gemset_strings() {
 # This is meant to be used with scripting.
 list_known_strings() {
 
-  sed -e 's/#.*$//g' -e 's/(//g' -e 's/)//g' < "$rvm_config_path/known" | sort -r | uniq
+  sed -e 's/#.*$//g' -e 's#\[##g' -e 's#\]##g' < "$rvm_config_path/known" | sort -r | uniq
 
   return $?
 }
@@ -202,9 +207,10 @@ list_known() {
   return $?
 }
 
-
 list_rubies_strings() {
-  ( builtin cd "$rvm_rubies_path" ; find -type d -maxdepth 0 | tail -n+2 | xargs -n1 basename -- |  __rvm_strip )
+
+  ( builtin cd "$rvm_rubies_path" ; find -maxdepth 0 -type d | tail -n+2 | xargs -n1 basename -- |  __rvm_strip )
+
   return $?
 }
 
@@ -214,17 +220,16 @@ list_rubies() {
 
   if [[ "${1:-""}" = "strings" ]]; then list_rubies_strings ; return 0 ; fi
 
-  current_ruby="$(__rvm_environment_identifier | awk -F"$rvm_gemset_separator" '{print $1}')"
+  current_ruby="$(__rvm_environment_identifier | awk -F"${rvm_gemset_separator:-"@"}" '{print $1}')"
 
   printf "\nrvm rubies\n"
 
-  rubies=($(builtin cd "$rvm_rubies_path/" ; find * -type d -maxdepth 0 2> /dev/null | awk '/[a-z]*-.*/ {print $NF}'))
+  rubies=($(builtin cd "$rvm_rubies_path/" ; find . -maxdepth 1 -mindepth 1 -type d 2> /dev/null | awk '/[a-z]*-.*/ {print $NF}'))
 
-  for version in "${rubies[@]}" ; do
+  for version in "${rubies[@]//.\/}" ; do
 
     [[ ! -x "$rvm_rubies_path/$version/bin/ruby" ]] && continue
 
-    (
     if echo "$version" | grep -q '^jruby-' ; then
 
       string="[ $("$rvm_rubies_path/$version/bin/ruby" -v | awk '{print $NF}' | sed -e 's/\[//' -e 's/\]//') ]"
@@ -247,15 +252,14 @@ list_rubies() {
     fi
 
     # TODO: Only use tput for interactive terminal sessions.
-    if [[ ${rvm_pretty_print:-0} -eq 1 ]] ; then
+    if [[ ${rvm_pretty_print_flag:-0} -eq 1 ]] ; then
 
       printf "$(tput setaf 2)$version$(tput sgr0) $string"
     else
       printf "$version $string"
     fi
-    )&
 
-  done ; wait
+  done
 
   if [[ -f "$rvm_config_path/default" ]] && [[ -s "$rvm_config_path/default" ]] ; then
 
@@ -263,15 +267,14 @@ list_rubies() {
 
     if [[ -n "$version" ]] ; then
 
-      printf "\n\nDefault Ruby (for new shells)\n"
+      printf "Default Ruby (for new shells)\n"
 
       string="[ $(file "$rvm_rubies_path/$version/bin/ruby" | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | \tr "\n" ' ')]"
 
-      if [[ ${rvm_pretty_print:-0} -eq 1 ]] ; then
-
-        printf "\n  $(tput setaf 2)$version$(tput sgr0) $string"
+      if [[ ${rvm_pretty_print_flag:-0} -eq 1 ]] ; then
+        printf "  $(tput setaf 2)$version$(tput sgr0) $string\n"
       else
-        printf "\n  $version $string"
+        printf "  $version $string\n"
       fi
 
     fi

data/scripts/log

@@ -9,9 +9,9 @@ if [[ ! -z "$2" ]] ; then level=$1 ; shift ; else level="info" ; fi
 
 message="${1//%/%%}"
 
-rvm_pretty_print=${rvm_pretty_print:-0}
-if [[ $rvm_pretty_print -eq 0 ]] ; then
-  if [[ $rvm_verbose_flag -gt 0 && -n "$level" ]] ; then
+if [[ ${rvm_pretty_print_flag:-0} -eq 0 ]] ; then
+
+  if [[ ${rvm_verbose_flag:-0} -gt 0 && -n "$level" ]] ; then
     message="$level: $message"
   fi
 
@@ -20,7 +20,9 @@ if [[ $rvm_pretty_print -eq 0 ]] ; then
     error|fail) printf "$message\n" >&2  ;;
     *) printf "$message"
   esac
+
 else
+
   case "$level" in
     debug) printf "$(tput setaf 5)$level$(tput sgr0): $message\n"     ;;
     info)  printf "$(tput setaf 2)$level$(tput sgr0): $message\n"     ;;
@@ -29,6 +31,7 @@ else
     fail)  printf "$(tput setaf 1)$level$(tput sgr0): $message\n" >&2 ;;
     *)     printf "$message"
   esac
+
 fi
 
 exit 0

data/scripts/maglev

@@ -12,7 +12,7 @@ zipfile=${version}.zip
 case "$system" in
   Linux)
   if [[ "$(uname -sm)" != "Linux x86_64" ]]; then
-    "$rvm_scripts_path/log" "error" "This script only works on a 64-bit Linux OS."
+    "$rvm_path/scripts/log" "error" "This script only works on a 64-bit Linux OS."
     echo "The result from \"uname -sm\" is \"`uname -sm`\" not \"Linux x86_64\""
     exit 1
   fi
@@ -26,19 +26,19 @@ case "$system" in
   #
   # Check the CPU and Mac OS profile.
   if [[ $CPU_TYPE != "i386" || $CPU_CAPABLE -ne 1 || $MAJOR -lt 10 || $MINOR -lt 5 ]] ; then
-    "$rvm_scripts_path/log" "error" "This script requires Mac OS 10.5 or later on a 64-bit Intel CPU."
+    "$rvm_path/scripts/log" "error" "This script requires Mac OS 10.5 or later on a 64-bit Intel CPU."
     exit 1
   fi
   ;;
   Solaris-x86)
   if [[ "$(uname -sm)" != "SunOS i86pc" ]]; then
-    "$rvm_scripts_path/log" "error" "This script only works on a 64-bit Solaris-x86 OS."
+    "$rvm_path/scripts/log" "error" "This script only works on a 64-bit Solaris-x86 OS."
     echo "The result from \"uname -sm\" is \"`uname -sm`\" not \"SunOS i86pc\""
     exit 1
   fi
   ;;
   *)
-  "$rvm_scripts_path/log" "error" "This script only works on a 64-bit Linux, Mac OS X, or Solaris-x86 machine"
+  "$rvm_path/scripts/log" "error" "This script only works on a 64-bit Linux, Mac OS X, or Solaris-x86 machine"
   echo "The result from \"uname -sm\" is \"`uname -sm`\""
   exit 1
   ;;
@@ -46,23 +46,23 @@ esac
 
 # We should run this as a normal user, not root.
 if [[ `id | cut -f2 -d= | cut -f1 -d\(` -eq 0 ]]; then
-  "$rvm_scripts_path/log" "error" "This script should be run as a normal user, not root."
+  "$rvm_path/scripts/log" "error" "This script should be run as a normal user, not root."
   exit 1
 fi
 
 # Check that the current directory is writable
 if [[ ! -w "." ]]; then
-  "$rvm_scripts_path/log" "error" "This script requires write permission on your current directory."
+  "$rvm_path/scripts/log" "error" "This script requires write permission on your current directory."
   \ls -ld $PWD
   exit 1
 fi
 
 # We're good to go. Let user know.
 machine_name="`uname -n`"
-"$rvm_scripts_path/log" "info" "Starting installation of $version on $machine_name"
+"$rvm_path/scripts/log" "info" "Starting installation of $version on $machine_name"
 
 # Figure out how much total memory is installed
-"$rvm_scripts_path/log" "info" "Setting up shared memory"
+"$rvm_path/scripts/log" "info" "Setting up shared memory"
 #
 # Ref: http://wiki.finkproject.org/index.php/Shared_Memory_Regions_on_Darwin
 # Ref: http://developer.postgresql.org/pgdocs/postgres/kernel-resources.html
@@ -94,7 +94,7 @@ case "$system" in
   shmall=$(($shmmax / 4096))
   ;;
   *)
-  "$rvm_scripts_path/log" "error" "Can't determine operating system. Check script."
+  "$rvm_path/scripts/log" "error" "Can't determine operating system. Check script."
   exit 1
   ;;
 esac
@@ -124,22 +124,22 @@ shmallNewMB=$(($shmallNew / 256))
 
 # Increase shmmax if appropriate
 if [[ $shmmaxNew -gt $shmmax ]]; then
-  "$rvm_scripts_path/log" "info" "Increasing max shared memory segment size to $shmmaxNewMB MB"
+  "$rvm_path/scripts/log" "info" "Increasing max shared memory segment size to $shmmaxNewMB MB"
   [[ $system = "Darwin" ]] && sudo sysctl -w kern.sysv.shmmax=$shmmaxNew
   [[ $system = "Linux" ]] && sudo bash -c "echo $shmmaxNew > /proc/sys/kernel/shmmax"
   [[ $system = "Solaris-x86" ]] && echo "[[Warning]] shmmax must be set manually on Solaris-x86"
 else
-  "$rvm_scripts_path/log" "info" "No need to increase max shared memory segment size"
+  "$rvm_path/scripts/log" "info" "No need to increase max shared memory segment size"
 fi
 
 # Increase shmall if appropriate
 if [[ $shmallNew -gt $shmall ]]; then
-  "$rvm_scripts_path/log" "info" "Increasing max shared memory allowed to $shmallNewMB MB"
+  "$rvm_path/scripts/log" "info" "Increasing max shared memory allowed to $shmallNewMB MB"
   [[ $system = "Darwin" ]] && sudo sysctl -w kern.sysv.shmall=$shmallNew
   [[ $system = "Linux" ]] && sudo bash -c "echo $shmallNew > /proc/sys/kernel/shmall"
   [[ $system = "Solaris-x86" ]] && echo "[[Warning]]shmall must be set manually on Solaris-x86"
 else
-  "$rvm_scripts_path/log" "info" "No need to increase max shared memory allowed"
+  "$rvm_path/scripts/log" "info" "No need to increase max shared memory allowed"
 fi
 
 # At this point, shared memory settings contain the values we want,
@@ -163,30 +163,30 @@ if [[ ! -f /etc/sysctl.conf ]] || [[ "$(\grep -sc "kern.*.shm" /etc/sysctl.conf)
       # Must configure shared memory settings manually.
     ;;
     *)
-      "$rvm_scripts_path/log" "error" "Can't determine operating system. Check script."
+      "$rvm_path/scripts/log" "error" "Can't determine operating system. Check script."
       exit 1
     ;;
   esac
   # Do nothing on Solaris-x86 since /etc/sysctl.conf is ignored on Solaris 10.
   if [[ "$system" != "Solaris-x86" ]]; then
-    "$rvm_scripts_path/log" "info" "Adding the following section to /etc/sysctl.conf"
+    "$rvm_path/scripts/log" "info" "Adding the following section to /etc/sysctl.conf"
     cat /tmp/sysctl.conf.$$
     sudo bash -c "cat /tmp/sysctl.conf.$$ >> /etc/sysctl.conf"
     /bin/rm -f /tmp/sysctl.conf.$$
   fi
 else
-  "$rvm_scripts_path/log" "info" "The following shared memory settings already exist in /etc/sysctl.conf"
+  "$rvm_path/scripts/log" "info" "The following shared memory settings already exist in /etc/sysctl.conf"
   echo "To change them, remove the following lines from /etc/sysctl.conf and rerun this script"
   \grep "kern.*.shm" /etc/sysctl.conf
 fi
 
 # Now setup for NetLDI in case we ever need it.
-"$rvm_scripts_path/log" "info" "Setting up GemStone netldi service port"
+"$rvm_path/scripts/log" "info" "Setting up GemStone netldi service port"
 if [[ $(\grep -sc "^gs64ldi" /etc/services) -eq 0 ]]; then
   echo '[[Info]] Adding "gs64ldi  50378/tcp" to /etc/services'
   sudo bash -c 'echo "gs64ldi         50378/tcp        # Gemstone netldi"  >> /etc/services'
 else
-  "$rvm_scripts_path/log" "info" "GemStone netldi service port is already set in /etc/services"
+  "$rvm_path/scripts/log" "info" "GemStone netldi service port is already set in /etc/services"
   echo "To change it, remove the following line from /etc/services and rerun this script"
   \grep "^gs64ldi" /etc/services
 fi

data/scripts/manage

@@ -3,12 +3,12 @@
 original_ruby_version=${rvm_ruby_version:-""}
 original_ruby_string=${rvm_ruby_string:-""}
 
-source "$rvm_scripts_path/base"
-source "$rvm_scripts_path/patches"
+source "$rvm_path/scripts/base"
+source "$rvm_path/scripts/patches"
 
 __rvm_check_for_clang() {
   if [[ -n "${rvm_clang_flag:-""}" ]] && ! command -v clang >/dev/null ; then
-    "$rvm_scripts_path/log" "fail" "\nYou passed the --clang option and clang is not in your path. \nPlease try again or do not use --clang.\n"
+    "$rvm_path/scripts/log" "fail" "\nYou passed the --clang option and clang is not in your path. \nPlease try again or do not use --clang.\n"
     return 1
   fi
 }
@@ -21,7 +21,7 @@ __rvm_check_for_bison() {
     command -v bison > /dev/null
     result=$?
     if [[ $? -gt 0 ]] ; then
-      "$rvm_scripts_path/log" "fail" \
+      "$rvm_path/scripts/log" "fail" \
         "\nbison is not available in your path. \nPlease ensure bison is installed before compiling from head.\n"
     fi
   fi
@@ -95,7 +95,7 @@ __rvm_apply_patches() {
         fi
 
       else
-        "$rvm_scripts_path/log" "warn" \
+        "$rvm_path/scripts/log" "warn" \
           "Patch '$patch_name' not found."
         result=1
       fi
@@ -115,7 +115,7 @@ __rvm_install_source() {
     *-head) __rvm_ensure_has_18_compat_ruby || return 1 ;;
   esac
 
-  "$rvm_scripts_path/log" "info" "\nInstalling Ruby from source to: $rvm_ruby_home, this may take a while depending on your cpu(s)...\n"
+  "$rvm_path/scripts/log" "info" "\nInstalling Ruby from source to: $rvm_ruby_home, this may take a while depending on your cpu(s)...\n"
 
   builtin cd "$rvm_src_path"
 
@@ -136,16 +136,16 @@ __rvm_install_source() {
   result=$?
 
   if [[ "$result" -gt 0 ]] ; then
-    "$rvm_scripts_path/log" "error" \
-      "There has been an error fetching the ruby interpreter. Aborting the installation."
+    "$rvm_path/scripts/log" "error" \
+      "There has been an error fetching the ruby interpreter. Halting the installation."
     return $result
   fi
 
   builtin cd "$rvm_ruby_src_path"
 
   result=$? ; if [[ "$result" -gt 0 ]] ; then
-    "$rvm_scripts_path/log" "error" \
-      "Source directory is missing.  Did the download or extraction fail?  Aborting the installation."
+    "$rvm_path/scripts/log" "error" \
+      "Source directory is missing.  Did the download or extraction fail?  Halting the installation."
     return $result
   fi
 
@@ -159,8 +159,8 @@ __rvm_install_source() {
   result="$?"
 
   if [[ "$result" -gt 0 ]]; then
-    "$rvm_scripts_path/log" "fail" \
-      "There has been an error applying the specified patches. Aborting the installation."
+    "$rvm_path/scripts/log" "fail" \
+      "There has been an error applying the specified patches. Halting the installation."
     return $result
   fi
 
@@ -171,7 +171,7 @@ __rvm_install_source() {
       __rvm_run "autoconf" "autoconf" "Running autoconf"
 
     else
-      "$rvm_scripts_path/log" "fail" \
+      "$rvm_path/scripts/log" "fail" \
         "rvm requires autoconf to install the selected ruby interpreter however autoconf was not found in the PATH."
       return 1
     fi
@@ -183,8 +183,8 @@ __rvm_install_source() {
     result=$?
 
     if [[ "$result" -gt 0 ]] ; then
-      "$rvm_scripts_path/log" "error" \
-        "There has been an error while configuring. Aborting the installation."
+      "$rvm_path/scripts/log" "error" \
+        "There has been an error while configuring. Halting the installation."
       return $result
     fi
 
@@ -208,28 +208,28 @@ __rvm_install_source() {
 
     local configure_command="./configure --prefix=$rvm_ruby_home ${db_configure_flags:-""} ${rvm_configure_flags:-""} ${configure_parameters:-""}"
 
-    __rvm_run "configure" "$configure_command" "#configuring $rvm_ruby_string"
+    __rvm_run "configure" "$configure_command" "$rvm_ruby_string - #configuring "
     result=$?
 
     if [[ "$result" -gt 0 ]] ; then
-      "$rvm_scripts_path/log" "error" \
-        "There has been an error while running configure. Aborting the installation."
+      "$rvm_path/scripts/log" "error" \
+        "There has been an error while running configure. Halting the installation."
       return $result
     fi
 
   else
-    "$rvm_scripts_path/log" "error" \
+    "$rvm_path/scripts/log" "error" \
       "Skipping configure step, 'configure' does not exist, did autoconf not run successfully?"
   fi
 
   rvm_ruby_make=${rvm_ruby_make:-"make"}
 
-  __rvm_run "make" "$rvm_ruby_make ${rvm_make_flags:-""}" "#compiling $rvm_ruby_string"
+  __rvm_run "make" "$rvm_ruby_make ${rvm_make_flags:-""}" "$rvm_ruby_string - #compiling "
   result=$?
 
   if [[ "$result" -gt 0 ]] ; then
-    "$rvm_scripts_path/log" "error" \
-      "There has been an error while running make. Aborting the installation."
+    "$rvm_path/scripts/log" "error" \
+      "There has been an error while running make. Halting the installation."
     return $result
   fi
 
@@ -239,12 +239,12 @@ __rvm_install_source() {
 
   rvm_ruby_make_install=${rvm_ruby_make_install:-"make install"}
 
-  __rvm_run "install" "$rvm_ruby_make_install" "#installing $rvm_ruby_string"
+  __rvm_run "install" "$rvm_ruby_make_install" "$rvm_ruby_string - #installing "
   result=$?
 
   if [[ "$result" -gt 0 ]] ; then
-    "$rvm_scripts_path/log" "error" \
-      "There has been an error while running make install. Aborting the installation."
+    "$rvm_path/scripts/log" "error" \
+      "There has been an error while running make install. Halting the installation."
     return $result
   fi
 
@@ -260,8 +260,8 @@ __rvm_install_source() {
 
   __rvm_post_install
 
-  "$rvm_scripts_path/log" "info" \
-    "#complete install of $rvm_ruby_string"
+  "$rvm_path/scripts/log" "info" \
+    "Install of $rvm_ruby_string - #complete "
 
   return 0
 }
@@ -288,7 +288,7 @@ __rvm_install_ruby() {
         if [[ "$rvm_head_flag" = 1 ]] ; then
 
           if [[ -n "$rvm_llvm_flag" ]] ; then
-            "$rvm_scripts_path/package" llvm install
+            "$rvm_path/scripts/package" llvm install
           fi
 
           macruby_path="/usr/local/bin"
@@ -305,8 +305,8 @@ __rvm_install_ruby() {
           result=$?
 
           if [[ "$result" -gt 0 ]] ; then
-            "$rvm_scripts_path/log" "error" \
-              "There has been an error while trying to install from source. Aborting the installation."
+            "$rvm_path/scripts/log" "error" \
+              "There has been an error while trying to install from source. Halting the installation."
             return $result
           fi
 
@@ -314,14 +314,14 @@ __rvm_install_ruby() {
           macruby_path="/Library/Frameworks/MacRuby.framework/Versions/0.6/usr/bin"
           # TODO: Separated nightly from head.
 
-          "$rvm_scripts_path/log" "info" "Retrieving the latest nightly macruby build..."
+          "$rvm_path/scripts/log" "info" "Retrieving the latest nightly macruby build..."
 
-          "$rvm_scripts_path/fetch" "$rvm_ruby_url"
+          "$rvm_path/scripts/fetch" "$rvm_ruby_url"
           result=$?
 
           if [[ "$result" -gt 0 ]] ; then
-            "$rvm_scripts_path/log" "error" \
-              "There has been an error while trying to fetch the source. Aborting the installation."
+            "$rvm_path/scripts/log" "error" \
+              "There has been an error while trying to fetch the source. Halting the installation."
             return $result
           fi
 
@@ -335,15 +335,15 @@ __rvm_install_ruby() {
           macruby_path="/Library/Frameworks/MacRuby.framework/Versions/${rvm_ruby_version}/usr/bin"
 
           # TODO: Separated nightly from head.
-          "$rvm_scripts_path/log" "info" "Retrieving MacRuby ${rvm_ruby_version} ..."
+          "$rvm_path/scripts/log" "info" "Retrieving MacRuby ${rvm_ruby_version} ..."
 
-          "$rvm_scripts_path/fetch" "$rvm_ruby_url"
+          "$rvm_path/scripts/fetch" "$rvm_ruby_url"
 
           result=$?
 
           if [[ "$result" -gt 0 ]] ; then
-            "$rvm_scripts_path/log" "error" \
-              "There has been an error while trying to fetch the source. Aborting the installation."
+            "$rvm_path/scripts/log" "error" \
+              "There has been an error while trying to fetch the source. Halting the installation."
             return $result
           fi
 
@@ -388,10 +388,12 @@ RubyWrapper
           if [[ "$binary_name" = "ruby" ]] ; then
             echo "$ruby_wrapper" > "$rvm_bin_path/$rvm_ruby_string"
           fi
-        done
+        done ; unset binaries
+
         __rvm_irbrc
+
       else
-        "$rvm_scripts_path/log" "fail" \
+        "$rvm_path/scripts/log" "fail" \
           "MacRuby can only be installed on a Darwin OS."
       fi
     ;;
@@ -401,36 +403,37 @@ RubyWrapper
 
         rvm_ruby_url="$(__rvm_db "ree_${rvm_ruby_version}_url")/$rvm_ruby_package_file.tar.gz"
 
-        "$rvm_scripts_path/log" "info" "Installing Ruby Enterprise Edition from source to: $rvm_ruby_home"
+        "$rvm_path/scripts/log" "info" "Installing Ruby Enterprise Edition from source to: $rvm_ruby_home"
 
         builtin cd "$rvm_src_path"
 
         if [[ ${rvm_force_flag:-0} -eq 0 && -d "$rvm_ruby_src_path" && ! -x "$rvm_ruby_src_path/installer" ]] ; then
 
-          "$rvm_scripts_path/log" \
+          "$rvm_path/scripts/log" \
             "It appears that the archive has already been extracted. Skipping extract (use --force to force re-download and extract)."
 
         else
-          "$rvm_scripts_path/log" "#fetching $rvm_ruby_package_file"
+          "$rvm_path/scripts/log" \
+            "$rvm_ruby_string - #fetching ($rvm_ruby_package_file)"
 
-          "$rvm_scripts_path/fetch" "$rvm_ruby_url"
+          "$rvm_path/scripts/fetch" \
+            "$rvm_ruby_url"
           result=$?
 
           if [[ "$result" -gt 0 ]] ; then
-            "$rvm_scripts_path/log" "error" \
-              "There has been an error while trying to fetch the source. Aborting the installation."
+            "$rvm_path/scripts/log" "error" \
+              "There has been an error while trying to fetch the source. Halting the installation."
             return $result
           fi
 
           rm -rf "$rvm_ruby_src_path"
 
-          __rvm_run "extract" "gunzip < \"$rvm_archives_path/$rvm_ruby_package_file.$rvm_archive_extension\" | tar xf - -C $rvm_src_path" "#extracting $rvm_ruby_package_file to $rvm_ruby_src_path"
-
+          __rvm_run "extract" "gunzip < \"$rvm_archives_path/$rvm_ruby_package_file.$rvm_archive_extension\" | tar xf - -C $rvm_src_path" "$rvm_ruby_string - #extracting $rvm_ruby_package_file to $rvm_ruby_src_path"
           result=$?
 
           if [[ "$result" -gt 0 ]] ; then
-            "$rvm_scripts_path/log" "error" \
-              "There has been an error while trying to extract the source. Aborting the installation."
+            "$rvm_path/scripts/log" "error" \
+              "There has been an error while trying to extract the source. Halting the installation."
             return $result
           fi
 
@@ -456,17 +459,17 @@ RubyWrapper
         result=$?
 
         if [[ "$result" -gt 0 ]] ; then
-          "$rvm_scripts_path/log" "error" \
-            "There has been an error while trying to apply patches to ree. Aborting the installation."
+          "$rvm_path/scripts/log" "error" \
+            "There has been an error while trying to apply patches to ree. Halting the installation."
           return $result
         fi
 
-        __rvm_run "install" "./installer -a $rvm_rubies_path/$rvm_ruby_string $rvm_ree_options $db_configure_flags $rvm_configure_flags" "#installing $rvm_ruby_string"
+        __rvm_run "install" "./installer -a $rvm_rubies_path/$rvm_ruby_string $rvm_ree_options $db_configure_flags $rvm_configure_flags" "$rvm_ruby_string - #installing "
         result=$?
 
         if [[ "$result" -gt 0 ]] ; then
-          "$rvm_scripts_path/log" "error" \
-            "There has been an error while trying to run the ree installer. Aborting the installation."
+          "$rvm_path/scripts/log" "error" \
+            "There has been an error while trying to run the ree installer. Halting the installation."
           return $result
         fi
 
@@ -481,7 +484,7 @@ RubyWrapper
         __rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_repo_url" "rvm_ruby_url"
 
         if [[ -z "$rvm_ruby_url" ]] ; then
-          "$rvm_scripts_path/log" "fail" "rvm does not know the rvm repo url for '${rvm_ruby_interpreter}_${rvm_ruby_version}'"
+          "$rvm_path/scripts/log" "fail" "rvm does not know the rvm repo url for '${rvm_ruby_interpreter}_${rvm_ruby_version}'"
           result=1
 
         else
@@ -494,7 +497,7 @@ RubyWrapper
 
     rbx|rubinius)
 
-      "$rvm_scripts_path/log" "info" "#dependency installation"
+      "$rvm_path/scripts/log" "info" "$rvm_ruby_string installing #dependencies "
 
       # Ensure we have a 1.8.7 compatible ruby installed.
       __rvm_ensure_has_18_compat_ruby || return 1
@@ -512,14 +515,14 @@ RubyWrapper
 
       if [[ -n "$(echo $rvm_ruby_version | awk '/^1\.0/')" ]] && [[ $rvm_head_flag -eq 0 ]] ; then
 
-        "$rvm_scripts_path/log" "info" "#downloading $rvm_ruby_package_file, this may take a while depending on your connection..."
+        "$rvm_path/scripts/log" "info" "$rvm_ruby_string #downloading ($rvm_ruby_package_file), this may take a while depending on your connection..."
 
-        "$rvm_scripts_path/fetch" "$rvm_ruby_url"
+        "$rvm_path/scripts/fetch" "$rvm_ruby_url"
         result=$?
 
         if [[ "$result" -gt 0 ]] ; then
-          "$rvm_scripts_path/log" "error" \
-            "There has been an error while trying to fetch the source. Aborting the installation."
+          "$rvm_path/scripts/log" "error" \
+            "There has been an error while trying to fetch the source. Halting the installation."
           return $result
         fi
         __rvm_run "extract" \
@@ -527,8 +530,8 @@ RubyWrapper
         result=$?
 
         if [[ "$result" -gt 0 ]] ; then
-          "$rvm_scripts_path/log" "error" \
-            "There has been an error while trying to extract the source. Aborting the installation."
+          "$rvm_path/scripts/log" "error" \
+            "There has been an error while trying to extract the source. Halting the installation."
           return $result
         fi
 
@@ -543,8 +546,8 @@ RubyWrapper
         result=$?
 
         if [[ "$result" -gt 0 ]] ; then
-          "$rvm_scripts_path/log" "error" \
-            "There has been an error while fetching the rbx git repo. Aborting the installation."
+          "$rvm_path/scripts/log" "error" \
+            "There has been an error while fetching the rbx git repo. Halting the installation."
           return $result
         fi
       fi
@@ -557,8 +560,8 @@ RubyWrapper
       result=$?
 
       if [[ "$result" -gt 0 ]] ; then
-        "$rvm_scripts_path/log" "error" \
-          "There has been an error while trying to apply patches to rubinius. Aborting the installation."
+        "$rvm_path/scripts/log" "error" \
+          "There has been an error while trying to apply patches to rubinius. Halting the installation."
         return $result
       fi
 
@@ -583,8 +586,8 @@ RubyWrapper
       result=$?
 
       if [[ "$result" -gt 0 ]] ; then
-        "$rvm_scripts_path/log" "error" \
-          "There has been an error while running '$rvm_ruby_configure'. Aborting the installation."
+        "$rvm_path/scripts/log" "error" \
+          "There has been an error while running '$rvm_ruby_configure'. Halting the installation."
         return $result
       fi
 
@@ -598,8 +601,8 @@ RubyWrapper
       result=$?
 
       if [[ "$result" -gt 0 ]] ; then
-        "$rvm_scripts_path/log" "error" \
-          "There has been an error while running '$rvm_ruby_configure'. Aborting the installation."
+        "$rvm_path/scripts/log" "error" \
+          "There has been an error while running '$rvm_ruby_configure'. Halting the installation."
         return $result
       fi ; unset ruby
 
@@ -651,15 +654,15 @@ RubyWrapper
       result=$?
 
       if [[ "$result" -gt 0 ]] ; then
-        "$rvm_scripts_path/log" "error" \
-          "There has been an error while trying to fetch the source. Aborting the installation."
+        "$rvm_path/scripts/log" "error" \
+          "There has been an error while trying to fetch the source. Halting the installation."
         return $result
       fi
 
       builtin cd "$rvm_ruby_src_path"
 
       if [[ ${rvm_head_flag:-0} -eq 1 ]] ; then
-        __rvm_run "ant.dist" "ant dist" "#ant dist"
+        __rvm_run "ant.dist" "ant dist" "$rvm_ruby_string - #ant dist"
       fi
 
       mkdir -p "$rvm_ruby_home/bin/"
@@ -681,7 +684,7 @@ RubyWrapper
 
       rm -rf "$rvm_ruby_home"
 
-      __rvm_run "install" "/bin/cp -Rf $rvm_ruby_src_path $rvm_ruby_home" "#installing JRuby to $rvm_ruby_home"
+      __rvm_run "install" "/bin/cp -Rf $rvm_ruby_src_path $rvm_ruby_home" "$rvm_ruby_string - #installing to $rvm_ruby_home"
 
       (
         builtin cd "$rvm_ruby_home/bin/"
@@ -715,7 +718,7 @@ RubyWrapper
       # jruby ships with some built in gems, copy them in to place.
       if [[ -d "$rvm_ruby_home/lib/ruby/gems/1.8" ]]; then
 
-        "$rvm_scripts_path/log" "info" "Copying across included gems"
+        "$rvm_path/scripts/log" "info" "Copying across included gems"
 
         cp -R "$rvm_ruby_home/lib/ruby/gems/1.8/" "$GEM_HOME/"
       fi
@@ -724,14 +727,15 @@ RubyWrapper
     maglev)
       __rvm_ensure_has_18_compat_ruby
 
-      "$rvm_scripts_path/log" "info" "Running MagLev prereqs checking script."
+      "$rvm_path/scripts/log" "info" \
+        "Running MagLev prereqs checking script."
 
-      "$rvm_scripts_path/maglev"
+      "$rvm_path/scripts/maglev"
       result=$?
 
       if [[ "$result" -gt 0 ]] ; then
-        "$rvm_scripts_path/log" "error" \
-          "Prerequisite checks have failed. Aborting the installation."
+        "$rvm_path/scripts/log" "error" \
+          "Prerequisite checks have failed. Halting the installation."
         return $result
       fi
 
@@ -745,8 +749,8 @@ RubyWrapper
         result=$?
 
         if [[ "$result" -gt 0 ]] ; then
-          "$rvm_scripts_path/log" "error" \
-            "There has been an error while trying to fetch the source. Aborting the installation."
+          "$rvm_path/scripts/log" "error" \
+            "There has been an error while trying to fetch the source. Halting the installation."
           return $result
         fi
       fi
@@ -760,14 +764,14 @@ RubyWrapper
         rvm_gemstone_url="${rvm_gemstone_url:-"$maglev_url/${rvm_gemstone_package_file}.${rvm_archive_extension}"}"
       fi
 
-      "$rvm_scripts_path/log" "info" "Downloading the GemStone package, this may take a while depending on your connection..."
+      "$rvm_path/scripts/log" "info" "Downloading the GemStone package, this may take a while depending on your connection..."
 
-      "$rvm_scripts_path/fetch" "$rvm_gemstone_url"
+      "$rvm_path/scripts/fetch" "$rvm_gemstone_url"
       result=$?
 
       if [[ "$result" -gt 0 ]] ; then
-        "$rvm_scripts_path/log" "error" \
-          "There has been an error while trying to fetch the GemStone package. Aborting the installation."
+        "$rvm_path/scripts/log" "error" \
+          "There has been an error while trying to fetch the GemStone package. Halting the installation."
         return $result
       fi
 
@@ -783,8 +787,8 @@ RubyWrapper
       result=$?
 
       if [[ "$result" -gt 0 ]] ; then
-        "$rvm_scripts_path/log" "error" \
-        "There has been an error while trying to extract the GemStone package. Aborting the installation."
+        "$rvm_path/scripts/log" "error" \
+        "There has been an error while trying to extract the GemStone package. Halting the installation."
         return $result
       fi
 
@@ -802,20 +806,30 @@ RubyWrapper
 
       (
         builtin cd "$rvm_ruby_home/bin/"
+
         for binary in maglev-irb maglev-ruby maglev-gem ; do
+
           ln -nfs "$binary" "${binary#maglev-}"
+
         done ; unset binary
       )
 
       binaries=(maglev-ruby maglev-irb maglev-gem)
+
       for binary in "${binaries[@]}" ; do
+
         __rvm_inject_gem_env "$rvm_ruby_home/bin/$binary"
+
       done
 
       builtin cd "$rvm_ruby_home"
+
       if [[ $rvm_head_flag -eq 1 ]] ; then
+
         git submodule update --init
+
         "$rvm_ruby_home/bin/maglev" force-reload
+
         ln -sf maglev.demo.key-$(uname -sm | \tr ' ' '-') etc/maglev.demo.key
       fi
 
@@ -824,14 +838,14 @@ RubyWrapper
       compatible_ruby="$(__rvm_18_compat_ruby)"
 
       if [[ ! -e ${rvm_ruby_home}/etc/conf.d/maglev.conf ]] ; then
-        "$rvm_scripts_path/log" "info" "Creating default 'maglev' repository."
+        "$rvm_path/scripts/log" "info" "Creating default 'maglev' repository."
         "$rvm_wrappers_path/$compatible_ruby/rake" "stone:create[maglev]" >/dev/null 2>&1
       fi
 
-      "$rvm_scripts_path/log" "info" "Generating maglev HTML documentation"
+      "$rvm_path/scripts/log" "info" "Generating maglev HTML documentation"
       "$rvm_wrappers_path/$compatible_ruby/rake" rdoc >/dev/null 2>&1
 
-      "$rvm_scripts_path/log" "info" "Generating smalltalk FFI."
+      "$rvm_path/scripts/log" "info" "Generating smalltalk FFI."
       "$rvm_wrappers_path/$compatible_ruby/rake" stwrappers >/dev/null 2>&1
 
       unset compatible_ruby
@@ -854,7 +868,7 @@ RubyWrapper
 
         mono_version="$(mono -V | head -n 1 | cut -d ' ' -f5)"
 
-        if "$rvm_scripts_path/match" "$mono_version" "([0-9]+)\.([0-9]+)\.?([0-9]+)?" ; then
+        if "$rvm_path/scripts/match" "$mono_version" "([0-9]+)\.([0-9]+)\.?([0-9]+)?" ; then
 
           mono_major_ver="$(echo "$mono_version" | cut -d '.' -f1)"
 
@@ -896,17 +910,17 @@ RubyWrapper
         cp -r "$rvm_ruby_src_path/Merlin/External.LCA_RESTRICTED/Languages/Ruby/redist-libs/ruby"/* "$rvm_ruby_home/lib/ruby"
         cp -r "$rvm_ruby_src_path/Merlin/Main/Languages/Ruby/Libs"/* "$rvm_ruby_home/lib/IronRuby"
       else
-        "$rvm_scripts_path/log" "info" "Retrieving IronRuby"
+        "$rvm_path/scripts/log" "info" "Retrieving IronRuby"
 
-        "$rvm_scripts_path/fetch" "$rvm_ruby_url" "$rvm_ruby_package_file"
+        "$rvm_path/scripts/fetch" "$rvm_ruby_url" "$rvm_ruby_package_file"
         result=$? ; if [[ "$result" -gt 0 ]] ; then
-          "$rvm_scripts_path/log" "error" "There has been an error while trying to fetch the source. Aborting the installation." ; return $result
+          "$rvm_path/scripts/log" "error" "There has been an error while trying to fetch the source. Halting the installation." ; return $result
         fi
 
         mkdir -p "$rvm_ruby_src_path" "$rvm_ruby_home"
         unzip -o  -d "${rvm_ruby_src_path}" "${rvm_archives_path}/${rvm_ruby_package_file}" >> "$rvm_ruby_log_path/extract.log" 2>> "$rvm_ruby_log_path/extract.error.log"
         result=$? ; if [[ "$result" -gt 1 ]] ; then
-          "$rvm_scripts_path/log" "error" "There has been an error while trying to extract $rvm_ruby_package_file. Aborting the installation." ; return $result
+          "$rvm_path/scripts/log" "error" "There has been an error while trying to extract $rvm_ruby_package_file. Halting the installation." ; return $result
         fi
 
         for dir in bin lib silverlight ; do
@@ -915,20 +929,31 @@ RubyWrapper
       fi
 
       binaries=(gem irb rdoc rake ri ruby)
+
       for binary_name in "${binaries[@]}" ; do
+
         if [[ -s "$rvm_ruby_home/bin/$binary_name" ]] ; then
+
           tr -d '\r' < "$rvm_ruby_home/bin/$binary_name" > "$rvm_ruby_home/bin/$binary_name.new"
+
           #sed -e '1,1s=.*=#!'"/usr/bin/env ir=" "$rvm_ruby_home/bin/$binary_name" > "$rvm_ruby_home/bin/$binary_name.new"
           mv -f "$rvm_ruby_home/bin/$binary_name.new" "$rvm_ruby_home/bin/$binary_name"
+
           chmod +x "$rvm_ruby_home/bin/$binary_name"
+
         fi
-      done
+      done ; unset binaries
 
       sed -e '1,1s=.*=#!'"/usr/bin/env bash=" "$rvm_ruby_home/bin/ir" | \tr -d '\r' > "$rvm_ruby_home/bin/ir.new"
+
       mv -f "$rvm_ruby_home/bin/ir.new" "$rvm_ruby_home/bin/ir"
+
       chmod +x "$rvm_ruby_home/bin/ir"
+
       ln -fs "$rvm_ruby_home/bin/ir" "$rvm_ruby_home/bin/ruby"
+
       builtin hash -r
+
       __rvm_run "gems.install" "PATH=$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:$rvm_ruby_home/bin:$PATH GEM_HOME=$rvm_ruby_gem_home GEM_PATH=$rvm_ruby_gem_home $rvm_ruby_home/bin/gem install --no-rdoc --no-ri rake $rvm_gem_options" "Installing $rvm_gem_name to $dir"
     ;;
 
@@ -952,8 +977,8 @@ RubyWrapper
       result=$?
 
       if [[ "$result" -gt 0 ]] ; then
-        "$rvm_scripts_path/log" "error" \
-          "There has been an error while trying to apply patches to mput. Aborting the installation."
+        "$rvm_path/scripts/log" "error" \
+          "There has been an error while trying to apply patches to mput. Halting the installation."
         return $result
       fi
 
@@ -964,8 +989,8 @@ RubyWrapper
           __rvm_run "autoconf" "autoconf" "Running autoconf"
 
         else
-          "$rvm_scripts_path/log" "fail" \
-            "rvm expects autoconf to install this ruby interpreter, autoconf was not found in PATH. Aborting installation."
+          "$rvm_path/scripts/log" "fail" \
+            "rvm expects autoconf to install this ruby interpreter, autoconf was not found in PATH. Halting installation."
           return $result
         fi
       fi
@@ -973,7 +998,7 @@ RubyWrapper
       if [[ -s ./Makefile ]] && [[ -z "$rvm_reconfigure_flag" ]] ; then
 
         if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then
-          "$rvm_scripts_path/log" "debug" "Skipping configure step, Makefile exists so configure must have already been run."
+          "$rvm_path/scripts/log" "debug" "Skipping configure step, Makefile exists so configure must have already been run."
         fi
 
       elif [[ -n "$rvm_ruby_configure" ]] ; then
@@ -982,8 +1007,8 @@ RubyWrapper
         result=$?
 
         if [[ "$result" -gt 0 ]] ; then
-          "$rvm_scripts_path/log" "error" \
-            "There has been an error while trying to configure the source. Aborting the installation."
+          "$rvm_path/scripts/log" "error" \
+            "There has been an error while trying to configure the source. Halting the installation."
           return $result
         fi
 
@@ -994,13 +1019,13 @@ RubyWrapper
         result=$?
 
         if [[ "$result" -gt 0 ]] ; then
-        "$rvm_scripts_path/log" "error" \
-          "There has been an error while trying to configure the source. Aborting the installation."
+        "$rvm_path/scripts/log" "error" \
+          "There has been an error while trying to configure the source. Halting the installation."
         return $result
       fi
 
     else
-      "$rvm_scripts_path/log" "error" \
+      "$rvm_path/scripts/log" "error" \
         "Skipping configure step, 'configure' script does not exist, did autoconf not run successfully?"
     fi
 
@@ -1010,8 +1035,8 @@ RubyWrapper
       result=$?
 
       if [[ "$result" -gt 0 ]] ; then
-        "$rvm_scripts_path/log" "error" \
-          "There has been an error while trying to run make. Aborting the installation."
+        "$rvm_path/scripts/log" "error" \
+          "There has been an error while trying to run make. Halting the installation."
         return $result
       fi
 
@@ -1021,12 +1046,12 @@ RubyWrapper
       result=$?
 
       if [[ "$result" -gt 0 ]] ; then
-        "$rvm_scripts_path/log" "error" \
-          "There has been an error while trying to run make install. Aborting the installation."
+        "$rvm_path/scripts/log" "error" \
+          "There has been an error while trying to run make install. Halting the installation."
         return $result
       fi
 
-      "$rvm_scripts_path/log" "info" "Installation of $rvm_ruby_string is complete."
+      "$rvm_path/scripts/log" "info" "Installation of $rvm_ruby_string is complete."
 
       export GEM_HOME="$rvm_ruby_gem_home"
       export GEM_PATH="$rvm_ruby_gem_path"
@@ -1053,14 +1078,16 @@ RubyWrapper
     ;;
 
     default)
-      "$rvm_scripts_path/log" "fail" "must specify a ruby interpreter to install."
+      "$rvm_path/scripts/log" "fail" \
+        "a ruby interpreter to install must be specified and not simply 'default'."
     ;;
 
-    *) "$rvm_scripts_path/log" "fail" "Ruby interpreter '$rvm_ruby_interpreter' is not known."
+    *) "$rvm_path/scripts/log" "fail" \
+      "Ruby interpreter '$rvm_ruby_interpreter' is not known."
 
   esac
 
-  rvm_hook="after_install" ; source "$rvm_scripts_path/hook"
+  rvm_hook="after_install" ; source "$rvm_path/scripts/hook"
 
   if [[ -n "$ruby_options" ]] ; then
     RUBYOPT="$ruby_options"
@@ -1085,7 +1112,7 @@ __rvm_fetch_from_github() {
     if [[ "$result" -gt 0 ]] ; then
       rvm_ruby_repo_http_url="${rvm_ruby_repo_url//git:/http:}"
 
-      "$rvm_scripts_path/log" "info" "Could not fetch $rvm_ruby_repo_url - trying $rvm_ruby_repo_http_url"
+      "$rvm_path/scripts/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
@@ -1105,7 +1132,7 @@ __rvm_fetch_from_github() {
 __rvm_fetch_ruby() {
   [[ ${rvm_ruby_selected_flag:-0} -eq 0 ]] && __rvm_select
 
-  "$rvm_scripts_path/log" "info" "#fetching ${rvm_ruby_string}"
+  "$rvm_path/scripts/log" "info" "$rvm_ruby_string - #fetching "
 
   if [[ ${rvm_head_flag:-0} -eq 0 && -z "${rvm_ruby_tag:-""}" && -z "${rvm_ruby_revision:-""}" ]] ; then
 
@@ -1139,14 +1166,15 @@ __rvm_fetch_ruby() {
           ;;
       esac
 
-      "$rvm_scripts_path/log" "info" "#downloading ${rvm_ruby_package_file}, this may take a while depending on your connection..."
+      "$rvm_path/scripts/log" "info" \
+        "$rvm_ruby_string - #downloading ${rvm_ruby_package_file}, this may take a while depending on your connection..."
 
-      "$rvm_scripts_path/fetch" "${rvm_ruby_url}"
+      "$rvm_path/scripts/fetch" "${rvm_ruby_url}"
       result=$?
 
       if [[ "$result" -gt 0 ]] ; then
-        "$rvm_scripts_path/log" "error" \
-          "There has been an error while trying to fetch the source. Aborting the installation."
+        "$rvm_path/scripts/log" "error" \
+          "There has been an error while trying to fetch the source. Halting the installation."
         return $result
       fi
     fi
@@ -1161,11 +1189,13 @@ __rvm_fetch_ruby() {
 
       case "$rvm_archive_extension" in
         tar.gz|tgz)
-          __rvm_run "extract" "gunzip < \"$rvm_archives_path/$rvm_ruby_package_file.$rvm_archive_extension\" | tar xf - -C /tmp/rvm_src_$$" "#extracting $rvm_ruby_package_file to $rvm_ruby_src_path"
+          __rvm_run "extract" "gunzip < \"$rvm_archives_path/$rvm_ruby_package_file.$rvm_archive_extension\" | tar xf - -C /tmp/rvm_src_$$" "$rvm_ruby_string - #extracting $rvm_ruby_package_file to $rvm_ruby_src_path"
           result=$?
 
           if [[ "$result" -gt 0 ]] ; then
-            "$rvm_scripts_path/log" "error" "There has been an error while trying to extract the source. Aborting the installation." ; return $result
+            "$rvm_path/scripts/log" "error" \
+              "There has been an error while trying to extract the source. Halting the installation."
+            return $result
           fi
           ;;
         zip)
@@ -1173,21 +1203,24 @@ __rvm_fetch_ruby() {
           result=$?
 
           if [[ "$result" -gt 0 ]] ; then
-            "$rvm_scripts_path/log" "error" "There has been an error while trying to extract $rvm_ruby_package_file. Aborting the installation."
+            "$rvm_path/scripts/log" "error" \
+              "There has been an error while trying to extract $rvm_ruby_package_file. Halting the installation."
             return $result
           fi
           ;;
         tar.bz2)
-          __rvm_run "extract" "bunzip2 < \"$rvm_archives_path/$rvm_ruby_package_file.$rvm_archive_extension\" | tar xf - -C /tmp/rvm_src_$$" "#extracting $rvm_ruby_package_file to $rvm_ruby_src_path"
+          __rvm_run "extract" "bunzip2 < \"$rvm_archives_path/$rvm_ruby_package_file.$rvm_archive_extension\" | tar xf - -C /tmp/rvm_src_$$" "$rvm_ruby_string - #extracting $rvm_ruby_package_file to $rvm_ruby_src_path"
           result=$?
 
           if [[ "$result" -gt 0 ]] ; then
-            "$rvm_scripts_path/log" "error" "There has been an error while trying to extract the source. Aborting the installation."
+            "$rvm_path/scripts/log" "error" \
+              "There has been an error while trying to extract the source. Halting the installation."
             return $result
           fi
           ;;
         *)
-          "$rvm_scripts_path/log" "error" "Unknown archive format extension '$rvm_archive_extension'. Aborting the installation."
+          "$rvm_path/scripts/log" "error" \
+            "Unknown archive format extension '$rvm_archive_extension'. Halting the installation."
           return 1
           ;;
       esac
@@ -1198,10 +1231,14 @@ __rvm_fetch_ruby() {
         mv "$rvm_src_path/$(echo "$rvm_ruby_string" | sed -e 's/-n.*//')" "$rvm_ruby_src_path"
       fi
 
+      "$rvm_ruby_string - #extracted to $rvm_ruby_src_path"
+
     else
-      "$rvm_scripts_path/log" "info" "#extracting $rvm_ruby_string to $rvm_ruby_src_path (already extracted)" ; return 0
+      "$rvm_path/scripts/log" "info" \
+        "$rvm_ruby_string - #extracted to $rvm_ruby_src_path (already extracted)"
     fi
 
+    return 0
   else
 
     mkdir -p "$rvm_repo_path"
@@ -1214,15 +1251,16 @@ __rvm_fetch_ruby() {
 
         if [[ -z "$rvm_ruby_revision" ]] ; then
 
-          "$rvm_scripts_path/log" "info" "Pulling from $rvm_ruby_repo_url, this may take a while depending on your connection..."
+          "$rvm_path/scripts/log" "info" \
+            "Pulling from $rvm_ruby_repo_url, this may take a while depending on your connection..."
 
           git pull origin master --force
 
           result=$?
 
           if [[ "$result" -gt 0 ]] ; then
-            "$rvm_scripts_path/log" "error" \
-              "There has been an error while trying to update the source from the remote repository. Aborting the installation."
+            "$rvm_path/scripts/log" "error" \
+              "There has been an error while trying to update the source from the remote repository. Halting the installation."
             return $result
           fi
 
@@ -1235,8 +1273,8 @@ __rvm_fetch_ruby() {
           result=$?
 
           if [[ "$result" -gt 0 ]] ; then
-            "$rvm_scripts_path/log" "error" \
-              "There has been an error while trying to checkout the source branch. Aborting the installation."
+            "$rvm_path/scripts/log" "error" \
+              "There has been an error while trying to checkout the source branch. Halting the installation."
             return $result
           fi
         fi
@@ -1246,21 +1284,21 @@ __rvm_fetch_ruby() {
 
         rvm_ruby_repo_http_url="${rvm_ruby_repo_url//git:/http:/}"
 
-        "$rvm_scripts_path/log" "info" "Cloning from $rvm_ruby_repo_url, this may take a while depending on your connection..."
+        "$rvm_path/scripts/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" "info" \
+          "$rvm_path/scripts/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_path/scripts/log" "error" \
+              "There has been an error while trying to fetch the repository. Halting the installation."
             return $result
           fi
         fi
@@ -1300,14 +1338,14 @@ __rvm_fetch_ruby() {
 
         builtin cd "$rvm_ruby_repo_path"
 
-        "$rvm_scripts_path/log" "info" "Updating ruby from $rvm_ruby_url"
+        "$rvm_path/scripts/log" "info" "Updating ruby from $rvm_ruby_url"
 
         __rvm_run "svn.switch" "svn switch $rvm_ruby_url"
 
         __rvm_run "svn.update" "svn update"
 
         if [[ -n "${rvm_rev:-""}" ]] ; then
-          "$rvm_scripts_path/log" "info" "Checking out revision ${rvm_rev/-r/-r } from $rvm_ruby_url"
+          "$rvm_path/scripts/log" "info" "Checking out revision ${rvm_rev/-r/-r } from $rvm_ruby_url"
 
           __rvm_run "svn.checkout" "svn update -q ${rvm_rev/-r/-r }"
         fi
@@ -1319,13 +1357,13 @@ __rvm_fetch_ruby() {
       result=$?
 
       if [[ "$result" -gt 0 ]] ; then
-        "$rvm_scripts_path/log" "error" \
-          "There has been an error while trying to fetch / update the source. Aborting the installation."
+        "$rvm_path/scripts/log" "error" \
+          "There has been an error while trying to fetch / update the source. Halting the installation."
         return $result
       fi
     fi
 
-    "$rvm_scripts_path/log" "info" "Copying from repo to src path..."
+    "$rvm_path/scripts/log" "info" "Copying from repo to src path..."
 
     rm -rf "$rvm_ruby_src_path"
 
@@ -1340,7 +1378,7 @@ __rvm_check_default() {
   local current_ruby_interpreter="$(echo "$rvm_ruby_string" | awk -F"${rvm_gemset_separator:-"@"}" '{print $1}')"
 
   if [[ -n "$current_ruby_interpreter" && "$current_ruby_interpreter" = "$default_ruby_interpreter" ]]; then
-    __rvm_run_with_env 'default.restore'  'system' 'rvm use system --default' 'Removing default ruby interpreter'
+    __rvm_run_with_env 'default.restore' 'system' 'rvm use system --default' 'Removing default ruby interpreter'
   fi
 }
 
@@ -1352,11 +1390,12 @@ __rvm_uninstall_ruby() {
 
     for dir in "$rvm_rubies_path" ; do
       if [[ -d "$dir/$rvm_ruby_string" ]] ; then
-        "$rvm_scripts_path/log" "info" "Removing $dir/$rvm_ruby_string..."
+        "$rvm_path/scripts/log" "info" "Removing $dir/$rvm_ruby_string..."
 
         rm -rf $dir/$rvm_ruby_string
       else
-        "$rvm_scripts_path/log" "info" "$dir/$rvm_ruby_string has already been removed."
+        "$rvm_path/scripts/log" "info" \
+          "$dir/$rvm_ruby_string has already been removed."
       fi
 
       if [[ -e "$rvm_bin_path/$rvm_ruby_string" ]] ; then
@@ -1371,7 +1410,8 @@ __rvm_uninstall_ruby() {
     __rvm_check_default
 
   else
-    "$rvm_scripts_path/log" "fail" "Cannot uninstall unknown package '$rvm_ruby_string'"
+    "$rvm_path/scripts/log" "fail" \
+      "Cannot uninstall unknown package '$rvm_ruby_string'"
   fi
 
   unset rvm_uninstall_flag
@@ -1387,11 +1427,11 @@ __rvm_remove_ruby() {
     for dir in $rvm_src_path $rvm_rubies_path ; do
 
       if [[ -d $dir/$rvm_ruby_string ]] ; then
-        "$rvm_scripts_path/log" "info" "Removing $dir/$rvm_ruby_string..."
+        "$rvm_path/scripts/log" "info" "Removing $dir/$rvm_ruby_string..."
         rm -rf $dir/$rvm_ruby_string
 
       else
-        "$rvm_scripts_path/log" "info" "it seems that $dir/$rvm_ruby_string is already non existent."
+        "$rvm_path/scripts/log" "info" "it seems that $dir/$rvm_ruby_string is already non existent."
       fi
 
       if [[ -e "$rvm_bin_path/$rvm_ruby_string" ]] ; then
@@ -1410,17 +1450,17 @@ __rvm_remove_ruby() {
     __rvm_remove_environments
     __rvm_remove_binaries
   else
-    "$rvm_scripts_path/log" "fail" "Cannot remove unknown package '$rvm_ruby_string'"
+    "$rvm_path/scripts/log" "fail" "Cannot remove unknown package '$rvm_ruby_string'"
   fi ; unset rvm_remove_flag
 }
 
 __rvm_remove_gemsets() {
   if [[ ${rvm_gems_flag:-0} -eq 1 ]] ; then
-    "$rvm_scripts_path/log" "info" "Removing $rvm_ruby_string gemsets..."
+    "$rvm_path/scripts/log" "info" "Removing $rvm_ruby_string gemsets..."
 
-    gemsets="$rvm_gems_path/$rvm_ruby_string $(builtin cd "${rvm_gems_path}"/ ; find * -type d -maxdepth 0 | awk '/'$rvm_ruby_string'@/')"
+    gemsets=($(builtin cd "${rvm_gems_path}"/ ; find . -maxdepth 1 -mindepth 1 -type d))
 
-    for gemset in $gemsets ; do
+    for gemset in "${gemsets[@]//.\/}" ; do
       if [[ -d "$gemset" ]] ; then
         rm -rf "$gemset"
       fi
@@ -1429,13 +1469,13 @@ __rvm_remove_gemsets() {
 }
 
 __rvm_remove_wrappers() {
-  "$rvm_scripts_path/log" "info" "Removing $rvm_ruby_string wrappers..."
+  "$rvm_path/scripts/log" "info" "Removing $rvm_ruby_string wrappers..."
 
-  local wrappers wrapper
+  local wrapper wrappers
 
-  wrappers="$rvm_wrappers_path/$rvm_ruby_string $(builtin cd "$rvm_wrappers_path"/ ; find * -type f -maxdepth 0 2>/dev/null | awk '/'$rvm_ruby_string'@/')"
+  wrappers=($(find "$rvm_path/wrappers" -maxdepth 1 -mindepth 1 -type d -iname "*$rvm_ruby_string*" 2>/dev/null))
 
-  for wrapper in $wrappers ; do
+  for wrapper in "${wrappers[@]}" ; do
     rm -rf "$wrapper"
   done
 
@@ -1443,68 +1483,86 @@ __rvm_remove_wrappers() {
 }
 
 __rvm_remove_environments() {
-  "$rvm_scripts_path/log" "info" "Removing $rvm_ruby_string environments..."
+  "$rvm_path/scripts/log" "info" "Removing $rvm_ruby_string environments..."
 
   local environments environment
 
-  environments="$rvm_environments_path/$rvm_ruby_string $(builtin cd "$rvm_environments_path"/ ; find * -type f -maxdepth 0 | awk '/'$rvm_ruby_string'@/')"
+  environments=($(find "$rvm_environments_path" -maxdepth 1 -mindepth 1 -type f -iname "*$rvm_ruby_string*" ))
 
-  for environment in $environments ; do
-    rm -rf "$environment"
+  for environment in "${environments[@]}" ; do
+    if [[ -d "$environment" ]] ; then
+      rm -rf "$environment"
+    fi
   done
 
   return 0
 }
 
 __rvm_remove_aliases() {
-  "$rvm_scripts_path/log" "info" "Removing $rvm_ruby_string aliases..."
+  "$rvm_path/scripts/log" "info" "Removing $rvm_ruby_string aliases..."
 
   local alias_name aliases
 
-  aliases=$(awk '/'$rvm_ruby_string'/' $rvm_config_path/alias | sed 's/=.*//')
+  aliases=($(awk '/'$rvm_ruby_string'/' $rvm_config_path/alias | sed 's/=.*//'))
 
-  for alias_name in $aliases ; do
+  for alias_name in "${aliases[@]}" ; do
     # Remove from alias key-value store
-    "$rvm_scripts_path/alias" delete "$alias_name" >/dev/null 2>&1
+    "$rvm_path/scripts/alias" delete "$alias_name" >/dev/null 2>&1
   done
 }
 
 __rvm_remove_archives() {
   if [[ ${rvm_archive_flag:-0} -eq 1 ]] ; then
-    "$rvm_scripts_path/log" "info" "Removing $rvm_ruby_string archives..."
+
+    "$rvm_path/scripts/log" "info" "Removing $rvm_ruby_string archives..."
+
     rm -f "$rvm_archives_path/${rvm_ruby_package_file}.${rvm_archive_extension}"
   fi
 }
 
 __rvm_remove_binaries() {
-  "$rvm_scripts_path/log" "info" "Removing $rvm_ruby_string binaries..."
+  "$rvm_path/scripts/log" "info" "Removing $rvm_ruby_string binaries..."
 
   # Iterate over all binaries and check for symlinked wrappers etc.
-  local binary_name
+  local binary_name binaries full_patch_path
+
+  binaries=($(find "$rvm_bin_path" -maxdepth 1 -mindepth 1 -type f -iname "*$rvm_ruby_string*" ))
+
+  for binary_name in "${binaries[@]}" ; do
 
-  for binary_name in $(builtin cd "$rvm_bin_path" ; find * -type f -maxdepth 0); do
     full_binary_path="$rvm_bin_path/$binary_name"
 
-    if [[ -L "$full_binary_path" ]] && "$rvm_scripts_path/match" "$(readlink "$full_binary_path")" "$rvm_ruby_string"; then
+    if [[ -L "$full_binary_path" ]] && "$rvm_path/scripts/match" "$(readlink "$full_binary_path")" "$rvm_ruby_string"; then
       rm -f "$full_binary_path"
     fi
-    unset full_binary_path
-  done
+  done ; unset binaries
+
+  return 0
 }
 
 __rvm_post_install() {
+
+  local rvm_ruby_aliases ruby_alias binary
+
   if [[ "$rvm_ruby_interpreter" != "jruby" ]] ; then
-    binaries=(${binaries:-"gem irb erb ri rdoc testrb rake"})
 
-    "$rvm_scripts_path/log" "info" "#shebangs adjustment for $rvm_ruby_string ($binaries)."
+    if [[ ${#binaries[@]} -lt 1 ]] ; then
+      binaries=(gem irb erb ri rdoc testrb rake)
+    fi
+
+    "$rvm_path/scripts/log" "info" \
+      "$rvm_ruby_string adjusting #shebangs for ($binaries)."
 
     for binary in "${binaries[@]}" ; do
 
-      if [[ -e "$rvm_ruby_home/bin/$binary" ]] || [[ -e "$rvm_ruby_src_path/bin/$binary" ]] ; then
+      if [[ -e "$rvm_ruby_home/bin/$binary" || -e "$rvm_ruby_src_path/bin/$binary" ]] ; then
+
+        if [[ "$rvm_ruby_src_path" != "$rvm_ruby_home" && -f "$rvm_ruby_src_path/bin/$binary" ]] ; then
 
-        if [[ "$rvm_ruby_src_path" != "$rvm_ruby_home" ]] && [[ -f "$rvm_ruby_src_path/bin/$binary" ]] ; then
           cp -f "$rvm_ruby_src_path/bin/$binary" "$rvm_ruby_home/bin/$binary"
+
         elif [[ -f "$rvm_ruby_gem_home/bin/$binary" ]] ; then
+
           cp -f "$rvm_ruby_gem_home/bin/$binary" "$rvm_ruby_home/bin/$binary"
         fi
 
@@ -1514,37 +1572,51 @@ __rvm_post_install() {
 
         chmod +x "$rvm_ruby_home/bin/$binary"
       fi
-    done ; unset binary binaries
+    done
+
+    binaries=(gem irb erb ri rdoc testrb rake)
   fi
 
   # Import the initial gemsets.
-  __rvm_run_with_env "gemsets.initial" "$rvm_ruby_string" "'$rvm_scripts_path/gemsets' initial" "#importing initial gems"
+  __rvm_run_with_env "gemsets.initial" "$rvm_ruby_string" "'$rvm_path/scripts/gemsets' initial" "$rvm_ruby_string - #importing default gemsets ($rvm_path/gemsets/)"
 
   __rvm_irbrc
+
   __rvm_generate_default_docs
 
   if [[ -n "$rvm_ruby_aliases" ]]; then
-    "$rvm_scripts_path/log" "info" "Setting up aliases for $rvm_ruby_string"
+    "$rvm_path/scripts/log" "info" "Setting up aliases for $rvm_ruby_string"
+
     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
+
+      "$rvm_path/scripts/log" info "Aliasing $rvm_ruby_string to $ruby_alias"
+
+      "$rvm_path/scripts/alias" delete "$ruby_alias" > /dev/null 2>&1
+
+      "$rvm_path/scripts/alias" create "$ruby_alias" "$rvm_ruby_string" > /dev/null 2>&1
+
     done < <(echo "$rvm_ruby_string" | \tr ' ' '\n' | sort -u)
-    unset rvm_ruby_aliases ruby_alias
   fi
 }
 
 __rvm_generate_default_docs() {
+
   if [[ "$rvm_docs_flag" = "1" && "$rvm_ruby_interpreter" != "macruby" ]]; then
+
     __rvm_run_with_env "docs.generate" "$rvm_ruby_string" "rvm docs generate-ri" "Attempting to generate ri documentation..."
   fi
 }
 
 __rvm_rubygems_setup() {
+
+  local home path dir directory_name version_number ruby_lib_gem_path
+
   if [[ -n "$(echo "$rvm_ruby_version" | awk '/^1\.9/')" ]] || [[ -n "$(echo "$rvm_ruby_interpreter" | awk '/^mput/')" ]] ; then
     install=0
+
   elif [[ "$rvm_ruby_string" = "ruby-head" ]] ; then
     install=0
+
   else
     install=1
   fi
@@ -1562,9 +1634,12 @@ __rvm_rubygems_setup() {
     home="$GEM_HOME" ; path="$GEM_PATH" # Save
 
     for dir in $rvm_ruby_global_gems_path $rvm_ruby_gem_home ; do
+
       export GEM_HOME="$dir" ; export GEM_PATH="$dir" ; export BUNDLE_PATH="$dir"
-      __rvm_run "rubygems.update" "$rvm_ruby_home/bin/gem update --system" "#rubygems update for $dir"
-    done ; unset home path dir
+
+      __rvm_run "rubygems.update" "$rvm_ruby_home/bin/gem update --system" "$rvm_ruby_string - updating #rubygems for $dir"
+
+    done
 
     GEM_HOME="$home" ; GEM_PATH="$path" ; BUNDLE_PATH="$home"
     export GEM_HOME GEM_PATH BUNDLE_PATH
@@ -1578,7 +1653,10 @@ __rvm_rubygems_setup() {
     version_number="${rvm_ruby_release_version}.${rvm_ruby_major_version}"
 
     if [[ "$version_number" == "." ]]; then
-      version_number="$(builtin cd "$directory_name" ; find * -type f -maxdepth 0 | \grep '^[[:digit:]].[[:digit:]]\(.[[:digit:]]\)\?' | head -n1)"
+
+      # TODO: Investigate this if statement, something feels not quite right.
+      version_number="$(builtin cd "$directory_name" ; find . -maxdepth 1 -mindepth 1 -type f | \grep '^[[:digit:]].[[:digit:]]\(.[[:digit:]]\)\?' | head -n1)"
+      version_number="${version_number//.\/}"
 
       if [[ -n "$version_number" ]]; then
         ruby_lib_gem_path="${directory_name}/${version_number}"
@@ -1590,24 +1668,24 @@ __rvm_rubygems_setup() {
       ruby_lib_gem_path="${directory_name}/${version_number}"
     fi
 
-    unset directory_name version_number
-
   elif [[ -n "$(echo "$rvm_ruby_interpreter" | awk '/^rbx|jruby/')" ]] ; then
 
     # Hands off rubygems for rbx & jruby
     if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then
-      "$rvm_scripts_path/log" "debug" "Skipping rubygems update for $rvm_ruby_version"
+      "$rvm_path/scripts/log" "debug" "Skipping rubygems update for $rvm_ruby_version"
     fi
 
     ruby_lib_gem_path="$rvm_ruby_home/lib/ruby/gems/jruby"
 
   else
-    "$rvm_scripts_path/log" "info" "#rubygems installing to $rvm_ruby_string"
+    "$rvm_path/scripts/log" "info" "$rvm_ruby_string - #rubygems installing to $rvm_ruby_string"
+
     rvm_rubygems_version="$(__rvm_db "${rvm_ruby_interpreter}_rubygems_version")"
     rvm_rubygems_version="${rvm_rubygems_version:-"$(__rvm_db "rubygems_version")"}"
     rvm_rubygems_url=$(__rvm_db "rubygems_${rvm_rubygems_version}_url")
     rvm_gem_package_name="rubygems-$rvm_rubygems_version"
     rvm_gem_url="$rvm_rubygems_url/$rvm_gem_package_name.tgz"
+
     # Sanity check... If setup.rb is missing from the rubygems source path,
     # something went wrong. Cleanup, aisle 3!
     if [[ ! -f "$rvm_src_path/$rvm_gem_package_name/setup.rb" ]]; then
@@ -1615,12 +1693,19 @@ __rvm_rubygems_setup() {
     fi
 
     if [[ ! -d "$rvm_src_path/$rvm_gem_package_name" ]] ; then
-      "$rvm_scripts_path/log" "info" "Retrieving $rvm_gem_package_name"
-      "$rvm_scripts_path/fetch" "$rvm_gem_url"
-      result=$? ; if [[ "$result" -gt 0 ]] ; then
-        "$rvm_scripts_path/log" "error" "There has been an error while trying to fetch the source. Aborting the installation." ; return $result
+
+      "$rvm_path/scripts/log" "info" "Retrieving $rvm_gem_package_name"
+
+      "$rvm_path/scripts/fetch" "$rvm_gem_url"
+      result=$?
+
+      if [[ "$result" -gt 0 ]] ; then
+        "$rvm_path/scripts/log" "error" \
+          "There has been an error while trying to fetch the source. Halting the installation." ; return $result
       fi
+
       mkdir -p "$rvm_src_path/$rvm_gem_package_name"
+
       __rvm_run "rubygems.extract" "gunzip < \"$rvm_archives_path/$rvm_gem_package_name.tgz\" | tar xf - -C $rvm_src_path" "Extracting $rvm_gem_package_name ..."
     fi
 
@@ -1629,7 +1714,7 @@ __rvm_rubygems_setup() {
     __rvm_run "rubygems.install" "GEM_PATH=$rvm_ruby_gem_path GEM_HOME=$rvm_ruby_gem_home BUNDLE_PATH=$rvm_ruby_gem_home $rvm_ruby_home/bin/ruby $rvm_src_path/$rvm_gem_package_name/setup.rb"
     result=$?
     if [[ $result -gt 0 ]] ; then
-      "$rvm_scripts_path/log" "warning" "#warning Installation of rubygems $rvm_ruby_package_name did not complete successfully."
+      "$rvm_path/scripts/log" "warning" "$rvm_ruby_string - #warning Installation of rubygems $rvm_ruby_package_name did not complete successfully."
     fi
 
     __rvm_inject_ruby_shebang "$rvm_ruby_home/bin/gem"
@@ -1645,14 +1730,14 @@ __rvm_rubygems_setup() {
     # Add ruby's gem path to ruby's lib direcotry.
 
     if [[ -d "$ruby_lib_gem_path" ]] ; then
-      \rm -rf "$ruby_lib_gem_path"
+      rm -rf "$ruby_lib_gem_path"
     fi
 
     mkdir -p ${ruby_lib_gem_path%\/*}
 
     ln -nfs "$rvm_ruby_gem_home" "$ruby_lib_gem_path"
 
-  fi; unset ruby_lib_gem_path
+  fi
 
   if [[ -s "$rvm_ruby_src_path/bin/rdoc" ]] ; then
     __rvm_inject_ruby_shebang "$rvm_ruby_src_path/bin/rdoc"
@@ -1666,28 +1751,44 @@ __rvm_rubygems_setup() {
 }
 
 __rvm_inject_ruby_shebang() {
+
+  local actual_file
+
   __rvm_actual_file $1
 
   if [[ -f "$actual_file" ]] ; then
     sed -e '1,1s=.*=#!'"/usr/bin/env ruby=" ${actual_file} > "${actual_file}.new"
+
     mv "${actual_file}.new" "${actual_file}" ; chmod +x "$actual_file"
-  fi ; unset actual_file
+  fi
 }
 
 __rvm_inject_gem_env() {
+
+  local actual_file string
+
   __rvm_actual_file $1
+
   if [[ -f "$actual_file" ]] ; then
+
     if [[ -n "$(head -n 1 $actual_file | awk '/[j]*ruby/')" ]] ; then
+
       string="ENV['GEM_HOME']=ENV['GEM_HOME'] || '$rvm_ruby_gem_home'\nENV['GEM_PATH']=ENV['GEM_PATH'] || '$rvm_ruby_gem_path'\nENV['PATH']='$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:$rvm_ruby_home/bin:' + ENV['PATH']\nENV['BUNDLE_PATH']=ENV['BUNDLE_PATH'] || '$rvm_ruby_gem_home'\n"
+
     elif [[ -n "$(head -n 1 $actual_file | awk '/bash/')" ]] ; then
+
       string="GEM_HOME=\${GEM_HOME:-'$rvm_ruby_gem_home'}\nGEM_PATH=\${GEM_PATH:-'$rvm_ruby_gem_path'}\nPATH=$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin:$rvm_ruby_home/bin:\$PATH\nBUNDLE_PATH=\${BUNDLE_PATH:-'$rvm_ruby_gem_home'}\n"
+
     fi
+
     if [[ -n "$string" ]] ; then
+
       awk "NR==2 {print \"$string\"} {print}" "$actual_file" > "$actual_file.new"
+
       mv $actual_file.new $actual_file ; chmod +x "$actual_file"
-      unset string
+
     fi
-  fi ; unset actual_file
+  fi
 }
 
 __rvm_actual_file() {
@@ -1705,8 +1806,8 @@ __rvm_manage_rubies() {
   rvm_gemset_name=""
   rvm_ruby_selected_flag=0
 
-  rvm_ruby_gem_home="${rvm_ruby_gem_home:-""//${rvm_gemset_separator}*}"
-  rvm_ruby_string="${rvm_ruby_string:-""//${rvm_gemset_separator}*}"
+  rvm_ruby_gem_home="${rvm_ruby_gem_home:-""//${rvm_gemset_separator:-"@"}*}"
+  rvm_ruby_string="${rvm_ruby_string:-""//${rvm_gemset_separator:-"@"}*}"
 
   # Given list of ruby strings.
   if [[ -n "${rubies_string:-""}" ]] ;then
@@ -1735,6 +1836,7 @@ __rvm_manage_rubies() {
     if [[ "$action" != "install" && "$action" != "remove" && "$action" != "uninstall" ]] ; then
 
       local ruby_string
+
       while read -r ruby_string
       do # Keep this on second line damnit!
 
@@ -1755,10 +1857,10 @@ __rvm_manage_rubies() {
 
           __rvm_unset_ruby_variables
         fi
-      done < <(builtin cd "$rvm_rubies_path" ; find * -type d -maxdepth 0 2> /dev/null)
+      done < <(builtin cd "$rvm_rubies_path" ; find . -maxdepth 1 -mindepth 1 -type d 2> /dev/null | sed -e 's#./##g')
 
     else
-      "$rvm_scripts_path/log" "warn" \
+      "$rvm_path/scripts/log" "warn" \
         'Really? '"$action"' all? See "rvm list known" and limit the selection to something more sane please :)'
     fi
   fi
@@ -1771,6 +1873,7 @@ args=($*)
 action="${args[0]:-""}"
 rubies_string="${args[1]:-""}"
 args="$(echo ${args[@]:2}) " # Strip trailing / leading / extra spacing.
+binaries=()
 
 __rvm_manage_rubies