rvm 1.0.2 → 1.0.3

data/scripts/hash

@@ -9,14 +9,15 @@
 # we then provide functionality of a file based hash
 #
 
-if [[ -z "$rvm_trace_flag" ]] ; then set +x ; else set -x ; fi
+if [[ "$rvm_trace_flag" -eq 2 ]] ; then set -x ; export rvm_trace_flag ; fi
 
-if [[ ! -z "$ZSH_VERSION" ]] ; then __array_start=1 ; else __array_start=0 ; fi
+if [[ -n "${ZSH_VERSION:-""}" ]] ; then __array_start=1 ; else __array_start=0 ; fi
 
 hash() {
   hash_name=$1 ; hash_key=$2 ; hash_value=$3
 
   eval "_hash_${hash_name}_keys=\${_hash_${hash_name}_keys:-()} ; _hash_${hash_name}_values=\${_hash_${hash_name}_values:-()}"
+
   if [[ -z "$hash_value" ]] ; then
     eval "length=\${#_hash_${hash_name}_keys[@]}"
     for (( index=$__array_start ; index < $length; index++ )) ; do
@@ -31,6 +32,5 @@ hash() {
     eval "_hash_${hash_name}_keys[$index]=\"$hash_key\""
     eval "_hash_${hash_name}_values[$index]=\"$hash_value\""
   fi
-  set +x
 }
 

data/scripts/help

@@ -4,9 +4,10 @@ source "$rvm_scripts_path/base"
 
 rvm_help_path="${rvm_help_path:-"$rvm_path/help"}"
 
-command="$1" ; shift
-action="$1" ; shift
-args="$(echo $*) " # Strip trailing / leading / extra spacing.
+args=($*)
+command="${args[0]}"
+action="${args[1]}"
+args="$(echo ${args[@]:2}) " # Strip trailing / leading / extra spacing.
 
 if [[ ! -z "$command" ]] && [[ -s "${rvm_help_path}/${command}" ]] ; then
   if [[ ! -z "$action" ]] && [[ -s "${rvm_help_path}/${command}/${action}" ]] ; then

data/scripts/hook

@@ -1,10 +1,14 @@
 #!/usr/bin/env bash
 
-if [[ ! -z "$rvm_hook" ]] ; then
+declare rvm_verbose_flag=${rvm_verbose_flag:-0}
+declare rvm_hook=${rvm_hook:-""}
+
+if [[ -n "$rvm_hook" ]] ; then
   if [[ -s "$rvm_hooks_path/$rvm_hook" ]] ; then
-    if [[ "$rvm_verbose_flag" -eq 1 ]] || [[ "$rvm_debug_flag" -eq 1 ]] ; then
+    if [[ $rvm_verbose_flag -eq 1 ]] || [[ "$rvm_debug_flag" -eq 1 ]] ; then
       "$rvm_scripts_path/log" "info" "running hook $rvm_hook"
     fi
     source "$rvm_hooks_path/$rvm_hook"
   fi
-fi ; unset rvm_hook
+fi
+unset rvm_hook

data/scripts/info

@@ -1,15 +1,20 @@
 #!/usr/bin/env bash
 
+if [[ "$rvm_trace_flag" -eq 2 ]] ; then set -x ; export rvm_trace_flag ; fi
+
 source "$rvm_scripts_path/base"
 source "$rvm_scripts_path/version"
 
 rvm_ruby_gem_home="${rvm_ruby_gem_home:-$GEM_HOME}"
 
-if [[ ! -d "$rvm_ruby_gem_home" ]] && command -v gem > /dev/null 2>&1; then rvm_ruby_gem_home="$(gem env home)" ; fi
+if [[ ! -d "$rvm_ruby_gem_home" ]] && command -v gem > /dev/null 2>&1; then
+  rvm_ruby_gem_home="$(gem env home)"
+fi
 
 version_for() {
-  if command -v "$1" >/dev/null ; then
-    $1 --version | head -n1
+  local binary=$1
+  if command -v "$binary" >/dev/null ; then
+    $binary --version | head -n1
   else
     echo "not installed"
   fi
@@ -17,8 +22,8 @@ version_for() {
 
 info_system() {
   rvm_info="$rvm_info\n  system:\n    uname:       \"$(uname -a)\""
-  rvm_info="$rvm_info\n    zsh:         \"$(version_for zsh)\""
-  rvm_info="$rvm_info\n    bash:        \"$(version_for bash)\""
+  rvm_info="$rvm_info\n    bash:        \"$(command -v bash) => $(version_for bash)\""
+  rvm_info="$rvm_info\n    zsh:         \"$(command -v zsh) => $(version_for zsh)\""
   rvm_info="$rvm_info\n"
 }
 
@@ -77,7 +82,7 @@ info_environment() {
 info_debug() {
   rvm_info=$(__rvm_version)
   rvm_info="$rvm_info\n$("$rvm_scripts_path/info" "$rvm_ruby_string" "" )"
-  rvm_info="$rvm_info\nPATH:\n$(printf $PATH | awk -F":" '{print $1":"$2":"$3":"$4":"$5}' )"
+  rvm_info="$rvm_info\nPATH:\n$(printf "$PATH" | awk -F":" '{print $1":"$2":"$3":"$4":"$5}' )"
   rvm_info="$rvm_info\nuname -a: $(uname -a)"
   rvm_info="$rvm_info\npermissions: $(\ls -la $rvm_path{,/rubies})"
 
@@ -118,11 +123,10 @@ info_sections() {
   done
 }
 
-args="$*"
-ruby_strings="${args/ */}"
-sections="${args#* }"
-sections="${sections#"${sections%%[![:space:]]*}"}" # strip leading whitespace
-sections="${sections%"${sections##*[![:space:]]}"}" # strip trailing whitespace
+args=($*)
+ruby_strings="${args[0]// /}"
+args="$(echo ${args[@]:1}) " # Strip trailing / leading / extra spacing.
+sections="${args// /}"
 all_sections="system rvm ruby homes binaries environment"
 
 if "$rvm_scripts_path/match" "$all_sections debug" "${ruby_strings/,*/}" ; then
@@ -130,7 +134,7 @@ if "$rvm_scripts_path/match" "$all_sections debug" "${ruby_strings/,*/}" ; then
   ruby_strings=""
 fi
 
-if [[ -z "$sections" ]] ; then sections="$all_sections" ; fi
+if [[ -z "${sections// /}" ]] ; then sections="$all_sections" ; fi
 
 if [[ -z "$ruby_strings" ]] ; then
   printf "$(__rvm_environment_identifier):\n"
@@ -142,3 +146,5 @@ else
     info_sections
   done
 fi
+
+exit 0

data/scripts/install

@@ -201,7 +201,7 @@ fi
 spinner
 if [[ -d gemsets/ ]] ; then
   \mkdir -p "$rvm_gemsets_path"
-  for gemset_file in $(cd gemsets ; find \. -iname '*.gems' | sed 's/^\.\///') ; do
+  for gemset_file in $(builtin cd gemsets ; find \. -iname '*.gems' | sed 's/^\.\///') ; do
     destination="$rvm_gemsets_path/$gemset_file"
     destination_path="$(dirname "$destination")"
     if [[ ! -s "$destination" ]] ; then
@@ -214,7 +214,7 @@ fi
 spinner
 if [[ -d patchsets/ ]] ; then
   \mkdir -p "$rvm_patchsets_path"
-  for patchset_file in $(cd patchsets ; find \. -iname '*' | sed 's/^\.\///') ; do
+  for patchset_file in $(builtin cd patchsets ; find \. -iname '*' | sed 's/^\.\///') ; do
     destination="$rvm_patchsets_path/$patchset_file"
     destination_path="$(dirname "$destination")"
     if [[ ! -s "$destination" ]] ; then
@@ -318,6 +318,7 @@ if [[ "$upgrade_flag" -eq 1 ]] ; then
   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  * Gemset separator is '@' and will remain unless any rubies error using it."
+  printf "\n  * If you wish to have the 'pretty colors' again, set 'export rvm_pretty_print=1' in ~/.rvmrc.\n"
   printf "\n$(tput sgr0)\n"
   check_rubyopt_conditions
   printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"

data/scripts/list

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+rvm_pretty_print=${rvm_pretty_print:-0}
+
 rvm_base_except="selector"
 source "$rvm_scripts_path/base"
 
@@ -14,17 +16,17 @@ list_gemsets() {
   local all_rubies="$(list_strings)"
 
   printf "rvm gemsets\n"
-  for version in $(\ls "$rvm_gems_path/" 2> /dev/null | awk '/[a-z]*-.*/ {print $NF}') ; do
+  for version in $(ls "$rvm_gems_path/" 2> /dev/null | awk '/[a-z]*-.*/ {print $NF}') ; do
     ruby_version_name="$(echo "$version" | awk -F"$rvm_gemset_separator" '{print $1}')"
 
     [[ "$all_rubies" != *"$ruby_version_name"* ]] && continue
 
-    if echo "$version" | \grep -q '^jruby-' ; then
+    if echo "$version" | grep -q '^jruby-' ; then
       string="[ $("$rvm_rubies_path/$ruby_version_name/bin/ruby" -v | awk '{print $NF}' | sed -e 's/\[//' -e 's/\]//') ]"
     elif [[ -n "$(echo "$version" | awk '/^maglev-|^macruby-/')" ]] ; then
       string="[ x86_64 ]"
     else
-      string="[ $(file "$rvm_rubies_path/$ruby_version_name/bin/ruby" | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | \tr "\n" ' ')]"
+      string="[ $(file "$rvm_rubies_path/$ruby_version_name/bin/ruby" | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
     fi ; unset ruby_version_name
     printf "\n"
     if [[ "$version" = "$current_ruby" ]]; then
@@ -32,15 +34,23 @@ list_gemsets() {
     else
       printf "   "
     fi
-    printf "$(tput setaf 2)$version$(tput sgr0) $string"
+    if [[ $rvm_pretty_print -eq 1 ]] ; then
+      printf "$(tput setaf 2)$version$(tput sgr0) $string"
+    else
+      printf "$version $string"
+    fi
   done ; unset version
 
   if [[ -f "$rvm_config_path/default" ]] && [[ -s "$rvm_config_path/default" ]] ; then
-    version=$(\grep 'MY_RUBY_HOME' "$rvm_config_path/default" | head -n1 | awk -F"'" '{print $2}' | xargs basename --)
+    version=$(grep 'MY_RUBY_HOME' "$rvm_config_path/default" | head -n1 | awk -F"'" '{print $2}' | xargs basename --)
     if [[ ! -z "$version" ]] ; then
       printf "\n\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" ' ')]"
-      printf "\n  $(tput setaf 2)$version$(tput sgr0) $string"
+      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 -eq 1 ]] ; then
+        printf "\n  $(tput setaf 2)$version$(tput sgr0) $string"
+      else
+        printf "\n  $version $string"
+      fi
     fi ; unset version
   fi ; unset current_ruby version selected system_ruby system_version string binary
   printf "\n\n"
@@ -55,7 +65,11 @@ list_default() {
       if [[ ! -z "$version" ]] ; then
         printf "\n\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" ' ')]"
-        printf "\n   $(tput setaf 2)$version$(tput sgr0) $string\n"
+        if [[ $rvm_pretty_print -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
@@ -73,13 +87,13 @@ list_ruby_svn_tags() {
 # Query for valid rvm ruby strings
 # This is meant to be used with scripting.
 list_strings() {
-  \ls "$rvm_rubies_path"
+  ls "$rvm_rubies_path"
 }
 
 # This is meant to be used with scripting.
 list_gemset_strings() {
   local all_rubies="$(list_strings)"
-  for gemset in $(\ls "$rvm_gems_path/" 2>/dev/null | xargs -n1 basename -- | \grep -v '^\(@\|doc$\|cache$\|system$\)' | sort); do
+  for gemset in $(ls "$rvm_gems_path/" 2>/dev/null | xargs -n1 basename -- | \grep -v '^\(@\|doc$\|cache$\|system$\)' | sort); do
     local ruby_name="$(echo "$gemset" | awk -F$rvm_gemset_separator '{print $1}')"
     [[ "$all_rubies" != *"$ruby_name"* ]] && continue
     echo "$gemset"
@@ -97,7 +111,7 @@ list_known() {
     return 0
   fi
 
-  if [[ "$rvm_interactive" != "1" ]] ; then
+  if [[ "$rvm_interactive_flag" != "1" ]] ; then
     cat "$rvm_config_path/known"
   else
     ${PAGER:-less} "$rvm_config_path/known"
@@ -116,13 +130,13 @@ list_rubies() {
   current_ruby="$(__rvm_environment_identifier | awk -F"$rvm_gemset_separator" '{print $1}')"
 
   printf "\nrvm rubies\n"
-  for version in $(\ls "$rvm_rubies_path/" 2> /dev/null | awk '/[a-z]*-.*/ {print $NF}') ; do
-    if echo "$version" | \grep -q '^jruby-' ; then
+  for version in $(ls "$rvm_rubies_path/" 2> /dev/null | awk '/[a-z]*-.*/ {print $NF}') ; do
+    if echo "$version" | grep -q '^jruby-' ; then
       string="[ $("$rvm_rubies_path/$version/bin/ruby" -v | awk '{print $NF}' | sed -e 's/\[//' -e 's/\]//') ]"
     elif [[ ! -z "$(echo "$version" | awk '/^maglev-|^macruby-/')" ]] ; then
       string="[ x86_64 ]"
     else
-      string="[ $(file "$rvm_rubies_path/$version/bin/ruby" | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | \tr "\n" ' ')]"
+      string="[ $(file "$rvm_rubies_path/$version/bin/ruby" | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
     fi
     printf "\n"
     if [[ "$version" = "$current_ruby" ]]; then
@@ -131,15 +145,23 @@ list_rubies() {
       printf "   "
     fi
     # TODO: Only use tput for interactive terminal sessions.
-    printf "$(tput setaf 2)$version$(tput sgr0) $string"
+    if [[ $rvm_pretty_print -eq 1 ]] ; then
+      printf "$(tput setaf 2)$version$(tput sgr0) $string"
+    else
+      printf "$version $string"
+    fi
   done ; unset version
 
   if [[ -f "$rvm_config_path/default" ]] && [[ -s "$rvm_config_path/default" ]] ; then
-    version=$(\grep 'MY_RUBY_HOME' "$rvm_config_path/default" | head -n 1 | awk -F"'" '{print $2}' | xargs basename --)
+    version=$(grep 'MY_RUBY_HOME' "$rvm_config_path/default" | head -n 1 | awk -F"'" '{print $2}' | xargs basename --)
     if [[ ! -z "$version" ]] ; then
       printf "\n\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" ' ')]"
-      printf "\n  $(tput setaf 2)$version$(tput sgr0) $string"
+      if [[ $rvm_pretty_print -eq 1 ]] ; then
+        printf "\n  $(tput setaf 2)$version$(tput sgr0) $string"
+      else
+        printf "\n  $version $string"
+      fi
     fi ; unset version
   fi ; unset current_ruby version selected system_ruby system_version string binary
   printf "\n\n"
@@ -148,8 +170,9 @@ list_rubies() {
 # List all rvm installed rubies, default ruby and system ruby.
 # Display the rubies, indicate their architecture and indicate which is currently used.
 # This is not meant to be used with scripting. This is for interactive mode usage only.
-action="$1"
-[[ $# -gt 0 ]] && shift
+args=($*)
+action="${args[0]}"
+args="$(echo ${args[@]:1}) " # Strip trailing / leading / extra spacing.
 
 if [[ "known" = "$action" ]] ; then
   list_known
@@ -166,7 +189,12 @@ elif [[ "strings" = "$action" ]] ; then
 elif [[ "ruby_svn_tags" = "$action" ]] ; then
   list_ruby_svn_tags
 else # help
-  printf "\nUsage:  rvm list {known,gemsets,default,rubies,strings,known_strings}"
+  printf "
+  Usage:
+
+    rvm list {known,gemsets,default,rubies,strings,known_strings}
+
+"
   false
 fi
 

data/scripts/log

@@ -7,27 +7,28 @@ if [[ "$rvm_trace_flag" -eq 2 ]] ; then set -x ; export rvm_trace_flag ; fi
 
 if [[ ! -z "$2" ]] ; then level=$1 ; shift ; else level="info" ; fi
 
-message="$(echo "$1" | sed 's/%/%%/g')"
+message="${1//%/%%}"
+
+rvm_pretty_print=${rvm_pretty_print:-0}
+if [[ $rvm_pretty_print -eq 0 ]] ; then
+  if [[ $rvm_verbose_flag -eq 1 ]] && [[ -n "$level" ]] ; then
+    message="$level: $message"
+  fi
 
-if [[ "$rvm_interactive" != "1" ]] ; then
   case "$level" in
-    debug) shift ; printf "\n$level: $message\n"     ;;
-    info)  shift ; printf "\n$level: $message\n"     ;;
-    warn)  shift ; printf "\n$level: $message\n"     ;;
-    error) shift ; printf "\n$level: $message\n" >&2 ;;
-    fail)  shift ; printf "\n$level: $message\n" >&2 ;;
+    debug|info|warn) printf "$message\n"     ;;
+    error|fail) printf "$message\n" >&2 ;;
     *) printf "$message"
   esac
 else
   case "$level" in
-    debug) shift ; printf "\n$(tput setaf 5)$level$(tput sgr0): $message\n"     ;;
-    info)  shift ; printf "\n$(tput setaf 2)$level$(tput sgr0): $message\n"     ;;
-    warn)  shift ; printf "\n$(tput setaf 3)$level$(tput sgr0): $message\n"     ;;
-    error) shift ; printf "\n$(tput setaf 1)$level$(tput sgr0): $message\n" >&2 ;;
-    fail)  shift ; printf "\n$(tput setaf 1)$level$(tput sgr0): $message\n" >&2 ;;
-    *) printf "$message"
+    debug) printf "$(tput setaf 5)$level$(tput sgr0): $message\n"     ;;
+    info)  printf "$(tput setaf 2)$level$(tput sgr0): $message\n"     ;;
+    warn)  printf "$(tput setaf 3)$level$(tput sgr0): $message\n"     ;;
+    error) printf "$(tput setaf 1)$level$(tput sgr0): $message\n" >&2 ;;
+    fail)  printf "$(tput setaf 1)$level$(tput sgr0): $message\n" >&2 ;;
+    *)     printf "$message"
   esac
 fi
-set +x
 
 exit 0

data/scripts/maglev

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; fi
+if [[ "$rvm_trace_flag" -eq 2 ]] ; then set -x ; export rvm_trace_flag ; fi
 
 system="$(uname -s)"
 if [[ $system = "SunOS" ]] && [[ "$(uname -m)" = "i86pc" ]] ; then system="Solaris-x86" ; fi

data/scripts/manage

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+if [[ "$rvm_trace_flag" -eq 2 ]] ; then set -x ; export rvm_trace_flag ; fi
+
 original_ruby_version=$rvm_ruby_version
 original_ruby_string=$rvm_ruby_string
 
@@ -23,37 +25,48 @@ __rvm_check_for_bison() {
   fi
 }
 
-# Returns a number of patches, each on a new name
+# Emits a number of patches to STDOUT, each on a new name
 # Expands patchsets etc.
 __rvm_current_patch_names() {
   # TODO: Lookup default patches on rvm_ruby_string heirarchy.
-  local patch_level_seperator="%"
+  local separator="%"
   local patches="$rvm_patch_names default"
-  for patch_name in $(printf "$patches" | sed -e "s/,/ /g" -e "s#$patch_level_seperator#\\$patch_level_seperator#g" | __rvm_strip); do
-    __rvm_expand_patch_name "${patch_name//${patch_level_seperator}*/}"
+  for patch_name in $(echo "$patches" | \tr ',' ' ' | __rvm_strip); do
+    local level=1
+    local name="$patch_name"
+    if echo "$name" | \grep -q "$separator"; then
+      level="${name/*${separator}/}"
+      name="${name//${separator}*/}"
+    fi
+    local expanded_name="$(__rvm_expand_patch_name "$name")"
+    echo "${expanded_name}${separator}${level}"
   done
 }
 
 __rvm_apply_patches() {
   local patch_result=0
-  local patch_level_seperator="%"
+  local patch_level_separator="%"
   local patch_fuzziness="25"
+  local patch_level=1
   source_directory="${1:-"$rvm_ruby_src_path"}"
   __rvm_pushpop "$source_directory"
   unset source_directory
-  for patch_name in $(__rvm_current_patch_names | __rvm_strip); do
-    patch_level="1"
+  patches="$(__rvm_current_patch_names | __rvm_strip)"
+  for patch_name in $(echo $patches); do
     # If set, extract the patch level from the patch name.
-    if echo "$patch_name" | \grep -q "$patch_level_seperator"; then
-      patch_level="${patch_name/*${patch_level_seperator}/}"
-      patch_name="${patch_name/${patch_level_seperator}*/}"
+    patch_level=1
+    if echo "$patch_name" | \grep -q "$patch_level_separator"; then
+      patch_level="${patch_name//*${patch_level_separator}/}"
+      patch_name="${patch_name//${patch_level_separator}*/}"
     fi
     full_patch_path="$(__rvm_lookup_full_patch_path "$patch_name")"
     # Expand paths, and for those we found we then apply the patches.
     if [[ -n "$full_patch_path" ]]; then
-      __rvm_run "patch.apply.${patch_name/*\/}" "patch -F$patch_fuzziness -p$patch_level -f <\"$full_patch_path\"" "Applying patch '$patch_name' (located at $full_patch_path)"
-      # Detect failed patches
-      [[ "$?" -gt 0 ]] && patch_result=1
+      if [[ -f "$full_patch_path" ]] ; then
+        __rvm_run "patch.apply.${patch_name/*\/}" "patch -F$patch_fuzziness -p$patch_level -f <\"$full_patch_path\"" "Applying patch '$patch_name' (located at $full_patch_path)"
+        # Detect failed patches
+        [[ "$?" -gt 0 ]] && patch_result=1
+      fi
     else
       "$rvm_scripts_path/log" "warn" "Patch '$patch_name' not found."
       patch_result=1
@@ -250,7 +263,7 @@ RubyWrapper
     ;;
 
     ree)
-      if [[ -n "$(echo "$rvm_ruby_version" | awk '/^1\.8/')" ]] && [[ -z "$rvm_head_flag" ]] ; then
+      if [[ -n "$(echo "$rvm_ruby_version" | awk '/^1\.8/')" ]] && [[ $rvm_head_flag -eq 0 ]] ; then
         rvm_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_pushpop "$rvm_src_path"
@@ -328,7 +341,7 @@ RubyWrapper
       __rvm_conditionally_add_bin_path ; export PATH
       builtin hash -r
 
-      if [[ -n "$(echo $rvm_ruby_version | awk '/^1\.0/')" ]] && [[ -z "$rvm_head_flag" ]] ; then
+      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_scripts_path/fetch" "$rvm_url"
         result=$? ; if [[ "$result" -gt 0 ]] ; then
@@ -422,7 +435,7 @@ RubyWrapper
       fi
 
       builtin cd "$rvm_ruby_src_path"
-      if [[ -n "$rvm_head_flag" ]] ; then __rvm_run "ant.dist" "ant dist" "Running 'ant dist' (this could take a few minutes) ..." ; fi
+      if [[ $rvm_head_flag -eq 1 ]] ; then __rvm_run "ant.dist" "ant dist" "Running 'ant dist' (this could take a few minutes) ..." ; fi
 
       \mkdir -p "$rvm_ruby_home/bin/"
       if "$rvm_scripts_path/match" "$rvm_ruby_version" "1\.3" || "$rvm_scripts_path/match" "$rvm_ruby_version" "1\.2" ; then
@@ -489,7 +502,7 @@ RubyWrapper
         fi
       fi
 
-      if [[ -n "$rvm_head_flag" ]] ; then
+      if [[ $rvm_head_flag -eq 1 ]] ; then
         builtin cd "$rvm_ruby_src_path"
         rvm_gemstone_package_file="GemStone-$(\grep ^GEMSTONE version.txt | cut -f2 -d-).$(uname -sm | \tr ' ' '-')"
         rvm_gemstone_url="${rvm_gemstone_url:-"$maglev_url/${rvm_gemstone_package_file}.${rvm_archive_extension}"}"
@@ -534,7 +547,7 @@ RubyWrapper
       done ; unset binary
 
       builtin cd "$rvm_ruby_home"
-      if [[ -n "$rvm_head_flag" ]] ; then
+      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
@@ -569,7 +582,7 @@ RubyWrapper
         printf "mono must be installed and in your path in order to install IronRuby." ; return 1
       fi
 
-      if [[ "$rvm_head_flag" = 1 ]] ; then
+      if [[ $rvm_head_flag -eq 1 ]] ; then
           mono_version="$(mono -V | head -n 1 | cut -d ' ' -f5)"
           if "$rvm_scripts_path/match" "$mono_version" "([0-9]+)\.([0-9]+)\.?([0-9]+)?" ; then
             mono_major_ver="$(echo "$mono_version" | cut -d '.' -f1)"
@@ -755,7 +768,7 @@ __rvm_fetch_from_github() {
 __rvm_fetch_ruby() {
   [[ -z "$rvm_ruby_selected_flag" ]] && __rvm_select
 
-  if [[ -z "$rvm_head_flag" && -z "$rvm_ruby_tag" && -z "$rvm_ruby_revision" ]] ; then
+  if [[ $rvm_head_flag -eq 0 && -z "$rvm_ruby_tag" && -z "$rvm_ruby_revision" ]] ; then
     rvm_ruby_package_name="${rvm_ruby_package_name:-"$rvm_ruby_string"}"
     rvm_ruby_package_file="${rvm_ruby_package_file:-"$rvm_ruby_package_name"}"
     if [[ "ruby" = "$rvm_ruby_interpreter" ]]; then
@@ -805,7 +818,7 @@ __rvm_fetch_ruby() {
         fi
       fi
 
-      mv "/tmp/rvm_src_$$/$(\cd /tmp/rvm_src_$$ ; \ls)" "$rvm_ruby_src_path" ; \rm -rf "/tmp/rvm_src_$$"
+      mv "/tmp/rvm_src_$$/$(builtin cd /tmp/rvm_src_$$ ; \ls)" "$rvm_ruby_src_path" ; \rm -rf "/tmp/rvm_src_$$"
 
       if [[ -n "$rvm_ruby_name" ]] && [[ -d "$rvm_src_path/$(echo $rvm_ruby_string | sed -e 's/-n.*//')" ]] ; then
         mv "$rvm_src_path/$(echo "$rvm_ruby_string" | sed -e 's/-n.*//')" "$rvm_ruby_src_path"
@@ -854,10 +867,10 @@ __rvm_fetch_ruby() {
       if [[ -n "$rvm_ruby_tag" ]] ; then
         # TODO: Check if tag v is valid
         rvm_url="${rvm_url:-"$rvm_ruby_repo_url/tags/$(echo "$rvm_ruby_tag" | sed 's/^t//')"}"
-      elif [[ -z "$rvm_ruby_version" ]] && [[ -n "$rvm_head_flag" ]] ; then
+      elif [[ -z "$rvm_ruby_version" && $rvm_head_flag -eq 1 ]] ; then
         rvm_url="${rvm_url:-"$rvm_ruby_repo_url/trunk"}"
       elif [[  "$rvm_major_version" = "9" ]] ; then
-        if [[ -z "$rvm_minor_version" ]] || [[ "$rvm_minor_version" = 3 ]] ; then
+        if [[ -z "$rvm_minor_version" || "$rvm_minor_version" = 3 ]] ; then
           rvm_url="${rvm_url:-"$rvm_ruby_repo_url/trunk"}"
         else
           rvm_url="${rvm_url:-"$rvm_ruby_repo_url/branches/ruby_${rvm_release_version}_${rvm_major_version}_${rvm_minor_version}"}"
@@ -1038,7 +1051,7 @@ __rvm_post_install() {
   fi
 
   # Import the initial gemsets.
-  __rvm_run_with_env "gemsets.initial" "$rvm_ruby_string" 'rvm gemset initial' "Importing initial gems..."
+  __rvm_run_with_env "gemsets.initial" "$rvm_ruby_string" "'$rvm_scripts_path/gemsets' initial" "Importing initial gems..."
 
   __rvm_irbrc
   __rvm_generate_default_docs
@@ -1210,44 +1223,47 @@ __rvm_manage_rubies() {
   if [[ -n "$rubies_string" ]] ;then
     for rvm_ruby_string in $(echo "$rubies_string" | \tr ',' ' ') ; do
       current_manage_ruby_string="$rvm_ruby_string"
-      eval "__rvm_${rvm_action}_ruby"
+      eval "__rvm_${action}_ruby"
       result="$?"
       if [[ "$result" -gt 0 && "$manage_result" = 0 ]]; then
         manage_result="$result"
       fi
-      [[ "$result" = 0 && "$rvm_action" = "install" ]] && __rvm_record_install "$current_manage_ruby_string"
+      [[ "$result" = 0 && "$action" = "install" ]] && __rvm_record_install "$current_manage_ruby_string"
       unset current_manage_ruby_string
       __rvm_unset_ruby_variables
     done
   else # all
-    if [[ "$rvm_action" != "install" && "$rvm_action" != "remove" && "$rvm_action" != "uninstall" ]] ; then
+    if [[ "$action" != "install" && "$action" != "remove" && "$action" != "uninstall" ]] ; then
       while read -r bin_line
       do # Keep this on second line damnit!
         if [[ -x "$bin_line" ]] ; then
           current_manage_ruby_string="$(dirname "$bin_line" | xargs dirname | xargs basename)"
           rvm_ruby_string="$current_manage_ruby_string"
-          eval "__rvm_${rvm_action}_ruby"
+          eval "__rvm_${action}_ruby"
           result="$?"
           if [[ "$result" -gt 0 && "$manage_result" = 0 ]]; then
             manage_result="$result"
           fi
           # record as current_manage_string to prevent it being overridden.
-          [[ "$result" = 0 && "$rvm_action" = "install" ]] && __rvm_record_install "$current_manage_ruby_string"
+          [[ "$result" = 0 && "$action" = "install" ]] && __rvm_record_install "$current_manage_ruby_string"
           unset current_manage_ruby_string
           __rvm_unset_ruby_variables
         fi
       done < <(\ls "$rvm_rubies_path"/*/bin/ruby 2> /dev/null)
     else
-      "$rvm_scripts_path/log" "warn" 'Really? '"$rvm_action"' all? See "rvm list known" and limit the selection to something more sane please :)'
+      "$rvm_scripts_path/log" "warn" 'Really? '"$action"' all? See "rvm list known" and limit the selection to something more sane please :)'
     fi
   fi
 
   # TODO: This should return the exit status of the command that got called.
   return $manage_result
-
 }
 
-rvm_action="$1"
-rubies_string="$2"
+args=($*)
+action="${args[0]}"
+rubies_string="${args[1]}"
+args="$(echo ${args[@]:2}) " # Strip trailing / leading / extra spacing.
+
 __rvm_manage_rubies
+
 exit $?