rvm 1.0.6 → 1.0.7

data/scripts/rvm

@@ -4,9 +4,7 @@
 # http://rvm.beginrescueend.com
 # http://github.com/wayneeseguin/rvm
 
-rvm_reload_flag=${rvm_reload_flag:-0}
-rvm_loaded_flag=${rvm_loaded_flag:-0}
-if [[ $rvm_loaded_flag -eq 0 || $rvm_reload_flag -eq 1 ]] ; then
+if [[ ${rvm_loaded_flag:-0} -eq 0 || ${rvm_reload_flag:-0} -eq 1 ]] ; then
   rvm_reload_flag=0
 
   if [[ -z "$rvm_ignore_rvmrc" ]]; then
@@ -50,14 +48,13 @@ if [[ $rvm_loaded_flag -eq 0 || $rvm_reload_flag -eq 1 ]] ; then
   if [[ -z "$rvm_path" ]] ; then
     rvm_path="${rvm_prefix}rvm"
   fi
-  rvm_scripts_path="${rvm_scripts_path:-"$rvm_path/scripts"}"
 
   if [[ -d "$rvm_path" ]] ; then
     for script in array utility initialize version selector cli cd override_gem ; do
-      if [[ -f "$rvm_scripts_path/$script" ]] ; then
-        source "$rvm_scripts_path/$script"
+      if [[ -f "$rvm_path/scripts/$script" ]] ; then
+        source "$rvm_path/scripts/$script"
       else
-        "$rvm_scripts_path/log" "error" "RVM: Could not source script '$rvm_scripts_path/$script', file does not exist. RVM will likely not work as expected."
+        "$rvm_path/scripts/log" "error" "RVM: Could not source script '$rvm_path/scripts/$script', file does not exist. RVM will likely not work as expected."
       fi
     done
 

data/scripts/rvm-install

@@ -126,7 +126,7 @@ Be sure to get head often as rvm development happens fast,
 you can do this by running 'rvm update --head' followed by 'rvm reload'
 or opening a new shell
 
-  w⦿‿⦿$
+  w⦿‿⦿t
 
     ~ Wayne
 
@@ -145,7 +145,7 @@ Upgrade Notes
     rvm remove X ; rvm install X
 
   * If you wish to have the 'pretty colors' again, set in ~/.rvmrc:
-    export rvm_pretty_print=1
+    export rvm_pretty_print_flag=1
 "
 }
 
@@ -192,6 +192,7 @@ __rvm_initialize
 item="* "
 question="\n<?>"
 cwd="$PWD"
+
 source_path="${source_path:-$cwd}"
 rvm_archives_path="${rvm_archives_path:-"$rvm_path/archives"}"
 rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
@@ -209,13 +210,10 @@ fi
 
 rvm_gems_path="${rvm_gems_path:-"$rvm_path/gems"}"
 rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
-rvm_scripts_path="${rvm_scripts_path:-"$rvm_path/scripts"}"
 rvm_config_path="${rvm_config_path:-"$rvm_path/config"}"
 rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
 rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
 
-export rvm_gemset_separator="@" # TODO: Remove this after a while.
-
 printf "
   RVM:  Shell scripts enabling management of multiple ruby environments.
   RTFM: http://rvm.beginrescueend.com/
@@ -223,35 +221,60 @@ printf "
 "
 
 if [[ ${upgrade_flag:-0} -eq 1 ]] ;then
+
   printf "\nUpgrading the RVM installation in $rvm_path/"
+
 else
-  printf "\nInstalling rvm to $rvm_path/"
+
+  printf "\nInstalling RVM to $rvm_path/"
+
 fi
 
-mkdir -p "$rvm_archives_path" "$rvm_src_path" "$rvm_log_path" "$rvm_bin_path" "$rvm_gems_path" "$rvm_rubies_path" "$rvm_config_path" "$rvm_hooks_path" "$rvm_tmp_path"
+for directory in "$rvm_archives_path" "$rvm_src_path" "$rvm_log_path" "$rvm_bin_path" "$rvm_gems_path" "$rvm_rubies_path" "$rvm_config_path" "$rvm_hooks_path" "$rvm_tmp_path" ; do
+
+  if [[ ! -d "$directory" ]] ; then
+
+    mkdir -p "$directory"
+
+  fi
+
+done
 
 for file in README LICENCE ; do
+
   cp -f "$source_path/$file" "$rvm_path/"
+
 done
 
 #
 # Scripts
 #
 for dir_name in config scripts examples lib hooks help patches; do
-  mkdir -p "$rvm_path/$dir_name"
+
   if [[ -d "$source_path/$dir_name" ]] ; then
+
+    if [[ ! -d "$rvm_path/$dir_name" ]] ; then
+
+      mkdir -p "$rvm_path/$dir_name"
+
+    fi
+
     cp -Rf "$source_path/$dir_name" "$rvm_path"
+
   fi
-done ; unset dir_name
+
+done
 
 if [[ ! -s "$rvm_config_path/user" ]] ; then
-  mkdir -p "$rvm_config_path/"
   echo '# Users settings file, overrides db file settings and persists across installs.' >> "$rvm_config_path/user"
 fi
 
-scripts=("monitor" "match" "log" "install" "color" "db" "fetch" "log" "set" "package")
+scripts=(monitor match log install color db fetch log set package)
+
 for script_name in "${scripts[@]}" ; do
-  chmod +x "$rvm_scripts_path/$script_name" 2>/dev/null # Hide errors.
+
+  chmod +x "$rvm_path/scripts/$script_name" 2>/dev/null # Hide errors.
+
 done
 
 #
@@ -259,29 +282,48 @@ done
 #
 # Cleanse and purge...
 for file in rvm-prompt rvm rvmsudo rvm-shell rvm-auto-ruby ; do
+
   rm -f "$rvm_bin_path/$file"
+
   cp -f "$source_path/binscripts/$file" $rvm_bin_path/
+
 done
-chmod +x "$rvm_bin_path"/*
+
+chmod +x "$rvm_bin_path"/* # TODO: this is quite suboptimal.
 
 #
 # RC Files
 #
 if [[ -n "$rvm_auto_flag" ]] ; then
+
   printf "Checking rc files... ($rvm_rc_files)"
+
   if [[ "$rvm_loaded_flag" != "1" ]] ; then
+
     for rcfile in $(printf $rvm_rc_files) ; do
+
       if [[ ! -f $rcfile ]] ; then touch $rcfile ; fi
+
       if [[ -s "$HOME/.profile" ]] ; then
+
         if ! grep -q '.profile' "$rcfile" ; then
+
           echo "    Adding 'if [[ -s \$HOME/.profile ]] ; then source \$HOME ; fi' to $rcfile."
+
           printf "\n# rvm-install added line:\nif [[ -s \$HOME/.profile ]] ; then source \$HOME/.profile ; fi\n" >> "$rcfile"
+
         fi
+
       fi
+
       if ! grep -q "scripts\/rvm" "$rcfile" ; then
-        echo "    Adding 'if [[ -s $rvm_scripts_path/rvm ]] ; then source $rvm_scripts_path/rvm ; fi' to $rcfile."
-        printf "\n# rvm-install added:\nif [[ -s $rvm_scripts_path/rvm ]] ; then source $rvm_scripts_path/rvm ; fi\n" >> "$rcfile"
+
+        echo "    Adding 'if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi' to $rcfile."
+
+        printf "\n# rvm-install added:\nif [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi\n" >> "$rcfile"
+
       fi
+
     done
   fi
 fi
@@ -290,47 +332,91 @@ fi
 # Initial Interpreter Gemsets.
 #
 if [[ -d gemsets/ ]] ; then
-  mkdir -p "$rvm_gemsets_path"
+
+  if [[ ! -d "$rvm_path/gemsets" ]] ; then
+
+    mkdir -p "$rvm_path/gemsets"
+
+  fi
 
   for gemset_file in $(builtin cd gemsets ; find \. -iname '*.gems' | sed 's/^\.\///') ; do
-    destination="$rvm_gemsets_path/$gemset_file"
+
+    destination="$rvm_path/gemsets/$gemset_file"
+
     destination_path="$(dirname "$destination")"
+
     if [[ ! -s "$destination" ]] ; then
+
       mkdir -p "$destination_path"
+
       cp "gemsets/$gemset_file" "$destination"
+
     fi
-  done ; unset destination destination_path gemset_file
+
+  done
+
+  unset destination destination_path gemset_file
+
 fi
 
 if [[ -d patchsets/ ]] ; then
-  mkdir -p "$rvm_patchsets_path"
-  for patchset_file in $(builtin cd patchsets ; find \. -iname '*' | sed 's/^\.\///') ; do
-    destination="$rvm_patchsets_path/$patchset_file"
-    destination_path="$(dirname "$destination")"
+
+  if [[ ! -d "$rvm_path/patchsets" ]] ; then
+
+    mkdir -p "$rvm_path/patchsets"
+
+  fi
+
+  patchsets=($(builtin cd patchsets ; find \. -iname '*' | sed 's/^\.\///'))
+
+  for patchset_file in "${patchsets[@]}" ; do
+
+    destination="$rvm_path/patchsets/$patchset_file"
+
     if [[ ! -s "$destination" ]] ; then
+
+      destination_path="$(dirname "$destination")"
+
       mkdir -p "$destination_path"
+
       cp "patchsets/$patchset_file" "$destination"
+
     fi
-  done ; unset destination destination_path patchset_file
+  done
+
 fi
 
 #
 # Migrate ~/.rvm/ruby-X,jruby-X,... to ~/.rvm/rubies/ for 0.1.0.
 #
 rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
+
 mkdir -p "$rvm_rubies_path/"
+
 for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* $rvm_path/rbx-* $rvm_path/maglev-* $rvm_path/ree-* ; do
+
   if [[ -d "$ruby" ]] ; then
+
     mv "$ruby" "$rvm_rubies_path/"
+
     new_path="$rvm_rubies_path/$(basename $ruby)"
+
     for file in gem rake ; do
+
       if [[ -s "$new_path/bin/$file" ]] ; then
+
         sed -e '1,1s=.*=#!'"${new_path}/bin/ruby=" "${new_path}/bin/${file}" > "${new_path}/bin/${file}.new"
+
         mv -f "$new_path/bin/$file.new" "$new_path/bin/$file"
+
         chmod +x "$new_path/bin/$file"
+
       fi
+
     done
+
   fi
+
 done
 #
 # End of rubies migration.
@@ -340,36 +426,60 @@ done
 # Migrate old gemset directories to new gemset pattern.
 #
 for gemset in "$rvm_path"/gems/*\%* ; do
-  new_path=${gemset/\%/${rvm_gemset_separator}}
+
+  new_path=${gemset/\%/${rvm_gemset_separator:-"@"}}
+
   if [[ -d "$gemset" ]] && [[ ! -d "$new_path" ]] ; then
+
     printf "\n    Renaming $(basename "$gemset") to $(basename "$new_path") for new gemset separator."
+
     mv "$gemset" "$new_path"
+
   fi
+
 done
 
 for gemset in "$rvm_path"/gems/*\+* ; do
-  new_path=${gemset/\+/${rvm_gemset_separator}}
+
+  new_path=${gemset/\+/${rvm_gemset_separator:-"@"}}
+
   if [[ -d "$gemset" && ! -d "$new_path" ]] ; then
+
     printf "\n    Renaming $(basename "$gemset") to $(basename "$new_path") for new gemset separator."
+
     mv $gemset $new_path
+
   fi
+
 done
 
 for gemset in "$rvm_path"/gems/*\@ ; do
+
   new_path=$(echo $gemset | sed -e 's#\@$##')
+
   if [[ -d "$gemset" && ! -d "$new_path" ]] ; then
+
     printf "\n    Fixing: $(basename "$gemset") to $(basename "$new_path") for new gemset separator."
+
     mv "$gemset" "$new_path"
+
   fi
+
 done
 
 # Move from legacy defaults to the new, alias based system.
 if [[ -s "$rvm_config_path/default" ]]; then
-  original_version="$(basename "$(grep GEM_HOME "$rvm_config_path/default" | awk -F"'" '{print $2}' | sed "s#\%#${rvm_gemset_separator}#")")"
+
+  original_version="$(basename "$(grep GEM_HOME "$rvm_config_path/default" | awk -F"'" '{print $2}' | sed "s#\%#${rvm_gemset_separator:-"@"}#")")"
+
   if [[ -n "$original_version" ]]; then
-    "$rvm_scripts_path/alias" create default "$original_version" &> /dev/null
+
+    "$rvm_path/scripts/alias" create default "$original_version" &> /dev/null
+
   fi ; unset original_version
+
   rm -rf "$rvm_config_path/default"
+
 fi
 
 #
@@ -380,13 +490,21 @@ printf "\n    Correct permissions for base binaries in $rvm_bin_path..."
 mkdir -p "$rvm_bin_path"
 
 for file in rvm rvmsudo rvm-shell rvm-auto-ruby ; do
+
   [[ -s "$rvm_bin_path/$file" ]] && chmod +x "$rvm_bin_path/$file"
-done; unset file
+
+done
+
 printf "\n    Copying manpages into place."
 
-for man_file in $(builtin cd "$install_source_path/man" ; find * -type f -maxdepth 0 -print); do
+files=($(builtin cd "$install_source_path/man" ; find . -maxdepth 1 -mindepth 1 -type f -print))
+
+for file in "${files[@]//.\/}" ; do
+
   rm -rf "$rvm_man_path/$man_file"
+
   cp -R "$install_source_path/man/$man_file" "$rvm_man_path/"
+
 done
 
 [[ "$upgrade_flag" = 0 ]] && ./scripts/notes
@@ -400,13 +518,19 @@ if [[ ${upgrade_flag:-0} -eq 1 ]] ; then
   check_rubyopt_conditions
 
   printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"
+
 else
+
   if [[ ${rvm_selfcontained:-0} -eq 1 ]] ; then
+
     installation_complete
+
   fi
 
   if [[ -s "$HOME/.bashrc" ]] && grep -q '&& return' "$HOME/.bashrc" ; then
+
     andand_return_warning
+
   fi
 
   check_rubyopt_conditions

data/scripts/selector

@@ -44,7 +44,7 @@ __rvm_select() {
         fi
         rvm_ruby_patch_level=""
       else
-        "$rvm_scripts_path/log" "fail" "MacRuby can only be installed on a Darwin OS."
+        "$rvm_path/scripts/log" "fail" "MacRuby can only be installed on a Darwin OS."
       fi
     ;;
 
@@ -151,8 +151,8 @@ __rvm_select() {
         fi
       fi
 
-      if ! "$rvm_scripts_path/match" "$rvm_ruby_version" "^1\.8" ; then
-        "$rvm_scripts_path/log" "fail" "Unknown Ruby Enterprise Edition version: $rvm_ruby_version"
+      if ! "$rvm_path/scripts/match" "$rvm_ruby_version" "^1\.8" ; then
+        "$rvm_path/scripts/log" "fail" "Unknown Ruby Enterprise Edition version: $rvm_ruby_version"
       fi
     ;;
 
@@ -168,7 +168,7 @@ __rvm_select() {
 
     ruby)
       if [[ -z "${rvm_ruby_version:-""}" && ${rvm_head_flag:-0} -eq 0 ]]; then
-        "$rvm_scripts_path/log" "fail" "Unknown ruby version: $rvm_ruby_version"
+        "$rvm_path/scripts/log" "fail" "Unknown ruby version: $rvm_ruby_version"
 
       else
         rvm_ruby_repo_url="${rvm_ruby_repo_url:-"$(__rvm_db "ruby_repo_url")"}"
@@ -182,7 +182,7 @@ __rvm_select() {
     current)
       ruby_binary="$(command -v ruby)"
 
-      if [[ $? -eq 0 ]] && "$rvm_scripts_path/match" "$ruby_binary" "rvm" ; then
+      if [[ $? -eq 0 ]] && "$rvm_path/scripts/match" "$ruby_binary" "rvm" ; then
         rvm_ruby_string="$(dirname "$ruby_binary" | xargs dirname | xargs basename)"
 
       else
@@ -201,7 +201,7 @@ __rvm_select() {
 
       else
         if [[ -z "${rvm_ruby_string:-""}" ]] ; then
-          "$rvm_scripts_path/log" "fail" "Ruby implementation '$rvm_ruby_interpreter' is not known."
+          "$rvm_path/scripts/log" "fail" "Ruby implementation '$rvm_ruby_interpreter' is not known."
           return 1
         fi
       fi
@@ -233,8 +233,8 @@ __rvm_select() {
     fi
 
     if [[ ! -z "$rvm_gemset_name" ]] ; then
-      rvm_ruby_gem_home="${rvm_ruby_gem_home}${rvm_gemset_separator}${rvm_gemset_name}"
-      rvm_ruby_gem_path="${rvm_ruby_gem_home}:${rvm_gems_path}/${rvm_ruby_string}${rvm_gemset_separator}global"
+      rvm_ruby_gem_home="${rvm_ruby_gem_home}${rvm_gemset_separator:-"@"}${rvm_gemset_name}"
+      rvm_ruby_gem_path="${rvm_ruby_gem_home}:${rvm_gems_path}/${rvm_ruby_string}${rvm_gemset_separator:-"@"}global"
     fi
 
     rvm_ruby_selected_flag=1
@@ -287,7 +287,9 @@ __rvm_use() {
       done
     fi
 
-    [[ ${rvm_verbose_flag:-0} -gt 0 ]] && "$rvm_scripts_path/log" "info" "Now using system ruby."
+    if [[ ${rvm_verbose_flag:-0} -gt 0 ]] ; then
+      "$rvm_path/scripts/log" "info" "Now using system ruby."
+    fi
 
     export rvm_ruby_string="system"
 
@@ -304,11 +306,14 @@ __rvm_use() {
     IRBRC=${IRBRC:-""} ; if [[ -z "$IRBRC" ]] ; then unset IRBRC ; fi
 
     if [[ ! -d "$MY_RUBY_HOME" ]] ; then
-      "$rvm_scripts_path/log" "warn" "$rvm_ruby_interpreter $rvm_ruby_string is not installed."
+      "$rvm_path/scripts/log" "warn" \
+        "$rvm_ruby_interpreter $rvm_ruby_string is not installed."
+
       if [[ ${rvm_install_on_use_flag:-0} -eq 1 ]] ; then
-        "$rvm_scripts_path/manage" "install" "$rvm_ruby_string"
+        "$rvm_path/scripts/manage" "install" "$rvm_ruby_string"
       else
-        "$rvm_scripts_path/log" "info" "To install do: 'rvm install $rvm_ruby_string'"
+        "$rvm_path/scripts/log" "info" \
+          "To install do: 'rvm install $rvm_ruby_string'"
         return 1
       fi
     fi
@@ -317,7 +322,7 @@ __rvm_use() {
     __rvm_ensure_has_environment_files
 
     [[ ${rvm_verbose_flag:-0} -gt 0 ]] && \
-      "$rvm_scripts_path/log" "info" \
+      "$rvm_path/scripts/log" "info" \
       "Using ${GEM_HOME/${rvm_gemset_separator:-'@'}/ with gemset }"
 
     new_path="$GEM_HOME/bin:$rvm_ruby_global_gems_path/bin:$MY_RUBY_HOME/bin:$rvm_bin_path:$(__rvm_remove_rvm_from_path ; printf "$PATH")"
@@ -342,13 +347,13 @@ __rvm_use() {
 
     if [[ "${rvm_selfcontained:-""}" = "0" ]] ; then
       # Sets up the default wrappers.
-      "$rvm_scripts_path/wrapper" "$rvm_ruby_string" --no-prefix
+      "$rvm_path/scripts/wrapper" "$rvm_ruby_string" --no-prefix
     else
-      "$rvm_scripts_path/wrapper" "$rvm_scripts_path" "default"
+      "$rvm_path/scripts/wrapper" "$rvm_path/scripts" "default"
     fi
 
     if [[ "system" = "$rvm_ruby_interpreter" ]] ; then
-      "$rvm_scripts_path/alias" delete default &> /dev/null
+      "$rvm_path/scripts/alias" delete default &> /dev/null
       \find "$rvm_bin_path" -name 'default_*' -maxdepth 0 -delete
       \rm -f "$rvm_config_path/default"
       \rm -f "$rvm_environments_path/default"
@@ -357,8 +362,8 @@ __rvm_use() {
     else
       RUBY_VERSION="$("$rvm_ruby_home/bin/ruby" -v | sed 's#^\(.*\) (.*$#\1#')"
       export GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION
-      "$rvm_scripts_path/alias" delete default &> /dev/null
-      "$rvm_scripts_path/alias" create default "$environment_id" >& /dev/null
+      "$rvm_path/scripts/alias" delete default &> /dev/null
+      "$rvm_path/scripts/alias" create default "$environment_id" >& /dev/null
       \ln -nfs "$rvm_environments_path/$environment_id" "$rvm_environments_path/default"
       \ln -nfs "$rvm_wrappers_path/$environment_id" "$rvm_wrappers_path/default"
     fi
@@ -367,14 +372,14 @@ __rvm_use() {
   rvm_default_flag=0
 
   if [[ -n "${rvm_wrapper_name:-""}" ]] ; then
-    "$rvm_scripts_path/wrapper" "$environment_id" "$rvm_wrapper_name" > /dev/null 2>&1
+    "$rvm_path/scripts/wrapper" "$environment_id" "$rvm_wrapper_name" > /dev/null 2>&1
     rvm_wrapper_name=""
   fi
 
   if [[ -n "${rvm_ruby_alias:-""}" ]]; then
-    "$rvm_scripts_path/log" "info" "Attempting to alias $environment_id to $rvm_ruby_alias"
-    "$rvm_scripts_path/alias" delete "$rvm_ruby_alias" > /dev/null 2>&1
-    rvm_alias_expanded=1 "$rvm_scripts_path/alias" create "$rvm_ruby_alias" "$environment_id" > /dev/null 2>&1
+    "$rvm_path/scripts/log" "info" "Attempting to alias $environment_id to $rvm_ruby_alias"
+    "$rvm_path/scripts/alias" delete "$rvm_ruby_alias" > /dev/null 2>&1
+    rvm_alias_expanded=1 "$rvm_path/scripts/alias" create "$rvm_ruby_alias" "$environment_id" > /dev/null 2>&1
     ruby_alias="" ; rvm_ruby_alias=""
   fi
 
@@ -387,7 +392,7 @@ __rvm_use() {
     fi
   fi
 
-  rvm_hook="after_use" ; source "$rvm_scripts_path/hook"
+  rvm_hook="after_use" ; source "$rvm_path/scripts/hook"
 
   return 0
 }
@@ -411,15 +416,15 @@ __rvm_ruby_string() {
   rvm_ruby_revision=${rvm_ruby_revision:-""}
   rvm_ruby_tag=${rvm_ruby_tag:-""}
 
-  if echo "$rvm_ruby_string" | \grep -q "$rvm_gemset_separator" ; then
-    rvm_gemset_name="${rvm_ruby_string/*${rvm_gemset_separator}/}"
-    rvm_ruby_string="${rvm_ruby_string/${rvm_gemset_separator}*/}"
+  if echo "$rvm_ruby_string" | \grep -q "${rvm_gemset_separator:-"@"}" ; then
+    rvm_gemset_name="${rvm_ruby_string/*${rvm_gemset_separator:-"@"}/}"
+    rvm_ruby_string="${rvm_ruby_string/${rvm_gemset_separator:-"@"}*/}"
     rvm_sticky_flag=1
   fi
 
   # Alias'd rubies
   if [[ ${rvm_expanding_aliases:-0} -eq 0 && -n ${rvm_ruby_string:-""} ]]; then
-    if expanded_alias_name="$("$rvm_scripts_path/alias" show "$rvm_ruby_string" 2>/dev/null)" && [[ -n "$expanded_alias_name" ]] ; then
+    if expanded_alias_name="$("$rvm_path/scripts/alias" show "$rvm_ruby_string" 2>/dev/null)" && [[ -n "$expanded_alias_name" ]] ; then
       rvm_ruby_string="$expanded_alias_name"
 
     elif [[ "$rvm_ruby_string" = default ]]; then
@@ -428,96 +433,109 @@ __rvm_ruby_string() {
     fi
   fi
 
-  ruby_string=${rvm_ruby_string/${rvm_gemset_separator}*/}
+  ruby_string=${rvm_ruby_string/${rvm_gemset_separator:-"@"}*/}
 
   __rvm_unset_ruby_variables
 
-  strings=(${ruby_string//-/ })
+  strings=($(echo ${ruby_string//-/ }))
+
+  if [[ ${#strings[@]} -eq 0 ]] ; then
+
+    if echo "${GEM_HOME:-""}" | grep -q "rvm" ; then
+      # Current Ruby
+      strings="${GEM_HOME##*\/}"
+      strings=("${strings/%${rvm_gemset_separator:-"@"}*}")
+      rvm_ruby_string=${strings[@]:(1)}
+    else
+      strings=(system)
+      rvm_ruby_string="system"
+    fi
+  fi
 
-  for string in "${strings[@]}" ; do
+  for string in "${strings[@]:-""}" ; do
 
     # TODO: case...
 
     case "$string" in
       head)
 
-      rvm_ruby_revision="head"
-      rvm_ruby_patch_level="" ; rvm_ruby_revision="" ; rvm_ruby_tag=""
-      export rvm_head_flag=1
-      ;;
-
-    system)
-      rvm_ruby_interpreter="system"
-      rvm_ruby_patch_level="" ; rvm_ruby_tag="" ; rvm_head_flag=0 ; rvm_ruby_revision="" ; rvm_ruby_version="" ; rvm_gemset_name=""
-      return 0
-      ;;
-
-    nightly)
-      rvm_ruby_version="nightly"
-      rvm_nightly_flag=1
-      break
-      ;;
-
-    preview*)
-      rvm_ruby_patch_level="$string"
-      ;;
+        rvm_ruby_revision="head"
+        rvm_ruby_patch_level="" ; rvm_ruby_revision="" ; rvm_ruby_tag=""
+        export rvm_head_flag=1
+        ;;
 
-    rc[[:digit:]]*)
-      rvm_ruby_patch_level="$string"
-      ;;
-
-    [[:digit:]]\.[[:digit:]]*)
-      rvm_ruby_version="$string"
-      rvm_ruby_revision=""
-      rvm_ruby_tag=""
-      ;;
-
-    p[[:digit:]]*)
-      rvm_ruby_patch_level="$string"
-      ;;
-
-    #elif [[ -n "${rvm_ruby_version:-""}" ]] && "$rvm_scripts_path/match" "$string" "^
-    [[:digit:]][[:digit:]]*)
-
-      case "${rvm_ruby_interpreter:-""}" in
-        ree)
-          rvm_ruby_patch_level="$string"
-          rvm_ruby_revision=""
-          ;;
-
-        rbx)
-          rvm_ruby_patch_level="$string"
-          ;;
-
-        maglev)
-          rvm_ruby_version="$string"
-          rvm_ruby_revision=""
-          rvm_ruby_patch_level=""
-          ;;
-
-        *)
-          rvm_ruby_revision="r$string"
-          ;;
-      esac
-      ;;
-
-    r[[:digit:]]*)
-      rvm_ruby_patch_level=""
-      rvm_ruby_revision="$string"
-      ;;
+      system)
+        rvm_ruby_interpreter="system"
+        rvm_ruby_patch_level="" ; rvm_ruby_tag="" ; rvm_head_flag=0 ; rvm_ruby_revision="" ; rvm_ruby_version="" ; rvm_gemset_name=""
+        return 0
+        ;;
+
+      nightly)
+        rvm_ruby_version="nightly"
+        rvm_nightly_flag=1
+        break
+        ;;
+
+      preview*)
+        rvm_ruby_patch_level="$string"
+        ;;
+
+      rc[[:digit:]]*)
+        rvm_ruby_patch_level="$string"
+        ;;
+
+      [[:digit:]]\.[[:digit:]]*)
+        rvm_ruby_version="$string"
+        rvm_ruby_revision=""
+        rvm_ruby_tag=""
+        ;;
+
+      p[[:digit:]]*)
+        rvm_ruby_patch_level="$string"
+        ;;
+
+        #elif [[ -n "${rvm_ruby_version:-""}" ]] && "$rvm_path/scripts/match" "$string" "^
+        [[:digit:]][[:digit:]]*)
+
+        case "${rvm_ruby_interpreter:-""}" in
+          ree)
+            rvm_ruby_patch_level="$string"
+            rvm_ruby_revision=""
+            ;;
+
+          rbx)
+            rvm_ruby_patch_level="$string"
+            ;;
+
+          maglev)
+            rvm_ruby_version="$string"
+            rvm_ruby_revision=""
+            rvm_ruby_patch_level=""
+            ;;
+
+          *)
+            rvm_ruby_revision="r$string"
+            ;;
+        esac
+        ;;
+
+      r[[:digit:]]*)
+        rvm_ruby_patch_level=""
+        rvm_ruby_revision="$string"
+        ;;
 
-    s[[:digit:]]*)
-      rvm_ruby_revision=""
-      rvm_ruby_sha="$string"
-      ;;
+      s[[:digit:]]*)
+        rvm_ruby_revision=""
+        rvm_ruby_sha="$string"
+        ;;
 
-    tv[[:digit:]]* | t[[:digit:]]*)
-      rvm_ruby_patch_level="" ; rvm_ruby_revision=""
-      rvm_ruby_tag="$string"
-      ;;
+      tv[[:digit:]]* | t[[:digit:]]*)
+        rvm_ruby_patch_level="" ; rvm_ruby_revision=""
+        rvm_ruby_tag="$string"
+        ;;
 
-    m[[:digit:]]*)
-      rvm_ruby_mode="$string"
+      m[[:digit:]]*)
+        rvm_ruby_mode="$string"
       ;;
 
     u[[:alnum:]]*)
@@ -538,7 +556,7 @@ __rvm_ruby_string() {
       ;;
 
     *)
-      "$rvm_scripts_path/log" "error" \
+      "$rvm_path/scripts/log" "error" \
         "Unknown ruby string component: '$string'"
       return 1
       ;;
@@ -623,7 +641,7 @@ __rvm_gemset_select() {
 
   rvm_ruby_gem_home=${rvm_ruby_gem_home:-""}
   rvm_gemset_name=${rvm_gemset_name:-""}
-  rvm_ruby_global_gems_path="$rvm_path/gems/${rvm_ruby_string:-""}${rvm_gemset_separator}global"
+  rvm_ruby_global_gems_path="$rvm_path/gems/${rvm_ruby_string:-""}${rvm_gemset_separator:-"@"}global"
 
   if [[ -z "${rvm_gemset_name:-""}" ]] ; then
 
@@ -632,17 +650,17 @@ __rvm_gemset_select() {
     if [[ ${rvm_sticky_flag:-0} -eq 1 ]] ; then
 
       if [[ -n "${GEM_HOME:-""}" ]] ; then
-        rvm_gemset_name=$(echo $GEM_HOME | xargs basename | awk -F${rvm_gemset_separator} '{print $2}')
+        rvm_gemset_name=$(echo $GEM_HOME | xargs basename | awk -F${rvm_gemset_separator:-"@"} '{print $2}')
       fi
 
       if [[ -n "${rvm_ruby_gem_home:-""}" ]] ; then
-        rvm_gemset_name=$(echo $rvm_ruby_gem_home | xargs basename | awk -F${rvm_gemset_separator} '{print $2}')
+        rvm_gemset_name=$(echo $rvm_ruby_gem_home | xargs basename | awk -F${rvm_gemset_separator:-"@"} '{print $2}')
       fi
     fi
 
     if ! echo "${rvm_gemset_name:-""}" | grep -q "^[[:digit:]]\.[[:digit:]]" ; then
 
-      rvm_ruby_gem_home="$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator}${rvm_gemset_name}"
+      rvm_ruby_gem_home="$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator:-"@"}${rvm_gemset_name}"
 
     else
       if [[ -n "${rvm_ruby_string:-""}" && "${rvm_ruby_interpreter:-""}" != "system" ]] ; then
@@ -668,13 +686,13 @@ __rvm_gemset_select() {
     if [[ -n "${rvm_ruby_string:-""}" ]] ; then
 
       if [[ -z "${rvm_ruby_gem_home:-""}" || -n "${gemset:-""}" ]] ; then
-        rvm_ruby_gem_home="$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator}${rvm_gemset_name}"
+        rvm_ruby_gem_home="$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator:-"@"}${rvm_gemset_name}"
 
       elif [[ -n "${gemset:-""}" && "${rvm_gemset_name:-""}" != "${gemset:-""}" ]] ; then
-        rvm_ruby_gem_home="$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator}${rvm_gemset_name}"
+        rvm_ruby_gem_home="$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator:-"@"}${rvm_gemset_name}"
       fi
     else
-      "$rvm_scripts_path/log" "error" "Gemsets can not be used with non rvm controlled rubies (currently)."
+      "$rvm_path/scripts/log" "error" "Gemsets can not be used with non rvm controlled rubies (currently)."
       return 1
     fi
   fi
@@ -686,7 +704,7 @@ __rvm_gemset_select() {
 
     if [[ ${rvm_gemset_create_on_use_flag:-0} -ne 1 && ${rvm_create_flag:-0} -ne 1 && ${rvm_delete_flag:-0} -ne 1 ]] ; then
 
-      "$rvm_scripts_path/log" "error" "Gemset '$rvm_gemset_name' does not exist, rvm gemset create '$rvm_gemset_name' first."
+      "$rvm_path/scripts/log" "error" "Gemset '$rvm_gemset_name' does not exist, rvm gemset create '$rvm_gemset_name' first."
 
       return 1
     fi
@@ -697,7 +715,7 @@ __rvm_gemset_select() {
 
   if [[ -z "${rvm_ruby_gem_home:-""}" && -n "${rvm_ruby_string:-""}" ]] ; then
     rvm_ruby_gem_home="$rvm_gems_path/$rvm_ruby_string"
-    rvm_ruby_global_gems_path="$rvm_gems_path/$rvm_ruby_string${rvm_gemset_separator}global"
+    rvm_ruby_global_gems_path="$rvm_gems_path/$rvm_ruby_string${rvm_gemset_separator:-"@"}global"
   fi
 
   rvm_ruby_gem_path="$rvm_ruby_gem_home:$rvm_ruby_global_gems_path"
@@ -718,7 +736,7 @@ __rvm_gemset_select() {
 # Use a gemset specified by 'rvm_ruby_gem_home'
 __rvm_gemset_use() {
   if [[ -z "${rvm_gemset_name:-""}" ]] ; then
-    "$rvm_scripts_path/log" "error" "Gemset was not given.\n  Usage:\n    rvm gemset use <gemsetname>\n"
+    "$rvm_path/scripts/log" "error" "Gemset was not given.\n  Usage:\n    rvm gemset use <gemsetname>\n"
     return 1
   fi
 
@@ -727,21 +745,21 @@ __rvm_gemset_use() {
     if [[ ! -d "$rvm_ruby_gem_home" ]] ; then
 
       if [[ ${rvm_gemset_create_on_use_flag:-0} -eq 1 || ${rvm_create_flag:-0} -eq 1 ]] ; then
-        "$rvm_scripts_path/gemsets" create "$rvm_gemset_name"
+        "$rvm_path/scripts/gemsets" create "$rvm_gemset_name"
       else
-        "$rvm_scripts_path/log" "error" "Gemset '$rvm_gemset_name' does not exist, rvm gemset create '$rvm_gemset_name' first."
+        "$rvm_path/scripts/log" "error" "Gemset '$rvm_gemset_name' does not exist, rvm gemset create '$rvm_gemset_name' first."
         return 1
       fi
     fi
 
     if [[ ${rvm_interactive_flag:-0} -gt 0 && ${rvm_verbose_flag:-1} -ne 0 ]] ; then
-      "$rvm_scripts_path/log" "info" "Now using gemset '${rvm_gemset_name:-default}'"
+      "$rvm_path/scripts/log" "info" "Now using gemset '${rvm_gemset_name:-default}'"
     fi
 
-    rvm_ruby_gem_home="${GEM_HOME//${rvm_gemset_separator}*}${rvm_gemset_separator}${rvm_gemset_name}"
+    rvm_ruby_gem_home="${GEM_HOME//${rvm_gemset_separator:-"@"}*}${rvm_gemset_separator:-"@"}${rvm_gemset_name}"
     GEM_HOME="$rvm_ruby_gem_home"
     BUNDLE_PATH="$rvm_ruby_gem_home"
-    GEM_PATH="$rvm_ruby_gem_home/bin:$(echo "$GEM_HOME" | sed 's/'${rvm_gemset_separator}'.*$//')${rvm_gemset_separator}global/bin"
+    GEM_PATH="$rvm_ruby_gem_home/bin:$(echo "$GEM_HOME" | sed 's/'${rvm_gemset_separator:-"@"}'.*$//')${rvm_gemset_separator:-"@"}global/bin"
     export rvm_ruby_gem_home GEM_HOME BUNDLE_PATH GEM_PATH
 
     __rvm_use # Now ensure the selection takes effect for the environment.
@@ -752,8 +770,8 @@ __rvm_gemset_use() {
 
 __rvm_gemset_clear() {
   rvm_gemset_name="" ; shift # TODO: Is this shift necessary???
-  rvm_ruby_gem_home="${GEM_HOME//${rvm_gemset_separator:-'@'}*}"
-  rvm_ruby_global_gems_path="$(echo "${GEM_HOME:-""}" | sed 's/'${rvm_gemset_separator}'.*$//')${rvm_gemset_separator}global"
+  rvm_ruby_gem_home="${GEM_HOME//${rvm_gemset_separator:-"@"}*}"
+  rvm_ruby_global_gems_path="$(echo "${GEM_HOME:-""}" | sed 's/'${rvm_gemset_separator:-"@"}'.*$//')${rvm_gemset_separator:-"@"}global"
   GEM_HOME=$rvm_ruby_gem_home
   BUNDLE_PATH="$rvm_ruby_gem_home"
   GEM_PATH="$rvm_ruby_gem_home/bin:$rvm_ruby_global_gems_path/bin"