rvm 1.0.3 → 1.0.4

data/scripts/rvm-install

@@ -17,8 +17,6 @@ if [[ -d "$install_source_path/scripts" ]] && [[ -s "$install_source_path/script
   builtin cd "$install_source_path"
 fi
 
-sleep=0.010
-
 source scripts/version
 source scripts/utility
 
@@ -42,16 +40,116 @@ check_rubyopt_conditions() {
   fi
 }
 
-spinner_counter=0
-spinner() {
-  array=('/' '-' '\\' '|' '/' '-' '\\' '|')
-  index=$((($spinner_counter % 8)))
-  printf "\r${array[$index]}"
-  let "spinner_counter=spinner_counter+1"
-  sleep $sleep
+andand_return_instructions() {
+  printf "
+  This means that if you see something like:
+
+    '[ -z \"\$PS1\" ] && return'
+
+  then you change this line to:
+
+  if [[ -n \"\$PS1\" ]] ; then
+
+    # ... original content that was below the '&& return' line ...
+
+  fi # <= be sure to close the if at the end of the .bashrc.
+
+  # This is a good place to source rvm v v v
+  [[ -s \"\$HOME/.rvm/scripts/rvm\" ]] && source \"\$HOME/.rvm/scripts/rvm\"  # This loads RVM into a shell session.
+
+EOF - This marks the end of the .bashrc file
+"
+}
+
+installation_complete() {
+  printf "
+  You must now complete the install by loading RVM in new shells.
+
+  1) Place the folowing line at the end of your shell's loading files
+     (.bashrc or .bash_profile for bash and .zshrc for zsh),
+     after all PATH/variable settings:
+
+     [[ -s \"\$HOME/.rvm/scripts/rvm\" ]] && source \"\$HOME/.rvm/scripts/rvm\"  # This loads RVM into a shell session.
+
+     You only need to add this line the first time you install rvm.
+
+  2) Ensure that there is no 'return' from inside the ~/.bashrc file,
+     otherwise rvm may be prevented from working properly.
+
+     $(andand_return_instructions)
+
+     Be absolutely *sure* to REMOVE the '&& return'.
+
+     If you wish to DRY up your config you can 'source ~/.bashrc' at the bottom of your .bash_profile.
+
+     Placing all non-interactive (non login) items in the .bashrc,
+     including the 'source' line above and any environment settings.
+
+  3) CLOSE THIS SHELL and open a new one in order to use rvm.
+  \n"
+}
+
+andand_return_warning() {
+  printf "
+  WARNING:  you have a 'return' statement in your ~/.bashrc
+              This could cause some features of RVM to not work.
+
+  $(andand_return_instructions)
+
+  Even if you are using zsh you should still adjust the ~/.bashrc
+  If you have any questions about this please visit
+    #rvm on irc.freenode.net.
+  \n"
+}
+
+thank_you() {
+  printf "
+${name:-"$(whoami)"},
+
+Thank you very much for using RVM! I sincerely hope that RVM helps to
+make your work both easier and more enjoyable.
+
+If you have any questions, issues and/or ideas for improvement please
+join#rvm on irc.freenode.net and let me know, note you must register
+(http://bit.ly/5mGjlm) and identify (/msg nickserv <nick> <pass>) to
+talk, this prevents spambots from ruining our day.
+
+My irc nickname is 'wayneeseguin' and I hang out in #rvm typically
+
+  ~09:00-17:00EDT and again from ~21:00EDT-~23:00EDT
+
+If I do not respond right away, please hang around after asking your
+question, I will respond as soon as I am back.  It is best to talk in
+#rvm itself as then other users can help out should I be offline.
+
+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⦿‿⦿$
+
+    ~ Wayne
+
+"
+}
+
+upgrade_notes() {
+  printf "
+
+Upgrade Notes
+
+  * Ruby package dependency list for your OS is given by:
+    rvm notes
+
+  * If you encounter any issues with a ruby 'X' your best bet is to:
+    rvm remove X ; rvm install X
+
+  * If you wish to have the 'pretty colors' again, set in ~/.rvmrc:
+    export rvm_pretty_print=1
+"
 }
 
-if echo "$*" | \grep -q 'trace' ; then echo "$*" ; env | \grep '^rvm_' ; set -x ; fi
+if echo "$*" | grep -q 'trace' ; then echo "$*" ; env | grep '^rvm_' ; set -x ; fi
 
 while [[ $# -gt 0 ]] ; do
   token="$1" ; shift
@@ -76,7 +174,7 @@ if [[ -z "$rvm_path" ]] ; then rvm_path="${rvm_prefix}rvm" ; fi
 
 source scripts/initialize
 
-if \grep -q 'scripts/rvm' "$HOME"/.bash* 2>/dev/null || \grep -q 'scripts/rvm' "$HOME"/.zsh* 2>/dev/null; then
+if grep -q 'scripts/rvm' "$HOME"/.bash* 2>/dev/null || grep -q 'scripts/rvm' "$HOME"/.zsh* 2>/dev/null; then
   if [[ -d "$rvm_path" ]] && [[ -s "${rvm_path}/scripts/rvm" ]] ; then
     export upgrade_flag=1
   else
@@ -91,8 +189,8 @@ __rvm_initialize
 #
 # Setup & Configuration
 #
-item="$(tput setaf 2)* $(tput sgr0)"
-question="\n$(tput setaf 2)<?>$(tput sgr0)"
+item="* "
+question="\n<?>"
 cwd="$PWD"
 source_path="${source_path:-$cwd}"
 rvm_archives_path="${rvm_archives_path:-"$rvm_path/archives"}"
@@ -118,45 +216,41 @@ rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
 
 export rvm_gemset_separator="@" # TODO: Remove this after a while.
 
-printf "\n$(tput setaf 2)RVM:$(tput sgr0)   shell scripts which allow management of multiple ruby interpreters and environments."
-printf "\n$(tput setaf 2)RTFM: $(tput sgr0) http://rvm.beginrescueend.com/"
-printf "\n$(tput setaf 2)HELP: $(tput sgr0) http://webchat.freenode.net/?channels=rvm (#rvm on irc.freenode.net)"
+printf "
+  RVM:  Shell scripts enabling management of multiple ruby environments.
+  RTFM: http://rvm.beginrescueend.com/
+  HELP: http://webchat.freenode.net/?channels=rvm (#rvm on irc.freenode.net)
+"
 
-if [[ "$upgrade_flag" -eq 1 ]] ;then
-  printf "\n\n  Upgrading the RVM installation in $rvm_path/"
+if [[ ${upgrade_flag:-0} -eq 1 ]] ;then
+  printf "\nUpgrading the RVM installation in $rvm_path/"
 else
-  printf "\n\n  Installing rvm to $rvm_path/"
+  printf "\nInstalling rvm to $rvm_path/"
 fi
 
-spinner
-
-\mkdir -p "$rvm_archives_path" "$rvm_src_path" "$rvm_log_path" "$rvm_bin_path" "$rvm_gems_path" "$rvm_rubies_path" "$rvm_config_path" "$rvm_hooks_path" "$rvm_tmp_path"
+mkdir -p "$rvm_archives_path" "$rvm_src_path" "$rvm_log_path" "$rvm_bin_path" "$rvm_gems_path" "$rvm_rubies_path" "$rvm_config_path" "$rvm_hooks_path" "$rvm_tmp_path"
 
 for file in README LICENCE ; do
-  spinner
-  \cp -f "$source_path/$file" "$rvm_path/"
+  cp -f "$source_path/$file" "$rvm_path/"
 done
 
 #
 # Scripts
 #
 for dir_name in config scripts examples lib hooks help patches; do
-  spinner
-  \mkdir -p "$rvm_path/$dir_name"
+  mkdir -p "$rvm_path/$dir_name"
   if [[ -d "$source_path/$dir_name" ]] ; then
-    \cp -Rf "$source_path/$dir_name" "$rvm_path"
+    cp -Rf "$source_path/$dir_name" "$rvm_path"
   fi
 done ; unset dir_name
 
-spinner
 if [[ ! -s "$rvm_config_path/user" ]] ; then
-  \mkdir -p "$rvm_config_path/"
+  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")
 for script_name in "${scripts[@]}" ; do
-  spinner
   chmod +x "$rvm_scripts_path/$script_name" 2>/dev/null # Hide errors.
 done
 
@@ -165,29 +259,26 @@ done
 #
 # Cleanse and purge...
 for file in rvm-prompt rvm rvmsudo rvm-shell rvm-auto-ruby ; do
-  spinner && sleep $sleep
-  \rm -f "$rvm_bin_path/$file"
-  \cp -f "$source_path/binscripts/$file" $rvm_bin_path/
+  rm -f "$rvm_bin_path/$file"
+  cp -f "$source_path/binscripts/$file" $rvm_bin_path/
 done
-spinner
 chmod +x "$rvm_bin_path"/*
 
 #
 # RC Files
 #
-spinner
 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 [[ ! -f $rcfile ]] ; then touch $rcfile ; fi
       if [[ -s "$HOME/.profile" ]] ; then
-        if ! \grep -q '.profile' "$rcfile" ; 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
+      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"
       fi
@@ -198,28 +289,27 @@ fi
 #
 # Initial Interpreter Gemsets.
 #
-spinner
 if [[ -d gemsets/ ]] ; then
-  \mkdir -p "$rvm_gemsets_path"
+  mkdir -p "$rvm_gemsets_path"
+
   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
-      \mkdir -p "$destination_path"
-      \cp "gemsets/$gemset_file" "$destination"
+      mkdir -p "$destination_path"
+      cp "gemsets/$gemset_file" "$destination"
     fi
   done ; unset destination destination_path gemset_file
 fi
 
-spinner
 if [[ -d patchsets/ ]] ; then
-  \mkdir -p "$rvm_patchsets_path"
+  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 [[ ! -s "$destination" ]] ; then
-      \mkdir -p "$destination_path"
-      \cp "patchsets/$patchset_file" "$destination"
+      mkdir -p "$destination_path"
+      cp "patchsets/$patchset_file" "$destination"
     fi
   done ; unset destination destination_path patchset_file
 fi
@@ -228,14 +318,12 @@ 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/"
-spinner
+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
-      spinner
       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"
@@ -251,9 +339,6 @@ done
 #
 # Migrate old gemset directories to new gemset pattern.
 #
-spinner
-printf "\r*" # Stop spinner.
-
 for gemset in "$rvm_path"/gems/*\%* ; do
   new_path=${gemset/\%/${rvm_gemset_separator}}
   if [[ -d "$gemset" ]] && [[ ! -d "$new_path" ]] ; then
@@ -264,7 +349,7 @@ done
 
 for gemset in "$rvm_path"/gems/*\+* ; do
   new_path=${gemset/\+/${rvm_gemset_separator}}
-  if [[ -d "$gemset" ]] && [[ ! -d "$new_path" ]] ; then
+  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
@@ -272,7 +357,7 @@ done
 
 for gemset in "$rvm_path"/gems/*\@ ; do
   new_path=$(echo $gemset | sed -e 's#\@$##')
-  if [[ -d "$gemset" ]] && [[ ! -d "$new_path" ]] ; then
+  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
@@ -280,77 +365,54 @@ 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
   fi ; unset original_version
-  \rm -rf "$rvm_config_path/default"
+  rm -rf "$rvm_config_path/default"
 fi
 
 #
 # End of gemset migration.
 #
 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
+
+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
 printf "\n    Copying manpages into place."
-for man_file in $(\ls "$install_source_path/man"); do
-  \rm -rf "$rvm_man_path/$man_file"
-  \cp -R "$install_source_path/man/$man_file" "$rvm_man_path/"
+for man_file in $(ls "$install_source_path/man"); do
+  rm -rf "$rvm_man_path/$man_file"
+  cp -R "$install_source_path/man/$man_file" "$rvm_man_path/"
 done
 
 [[ "$upgrade_flag" = 0 ]] && ./scripts/notes
 
 name="$(awk -F= '/^[[:space:]]*name/{print $2}' ~/.gitconfig 2>/dev/null)"
-printf "\n\n${name:-"$(whoami)"},\n"
-printf "\nThank you for using rvm. I hope that it makes your work easier and more enjoyable."
-printf "\nIf you have any questions, issues and/or ideas for improvement please hop in #rvm on irc.freenode.net and let me know."
-printf "\nMy irc nickname is 'wayneeseguin' and I hang out from ~09:00-17:00EST and again from ~21:00EST-~00:00EST."
-printf "\nIf I do not respond right away, please hang around after asking your question, I will respond as soon as I am back."
-printf "\nBe sure to get head often as rvm development happens fast, you can do this by running 'rvm update --head'."
-printf "\n  w$(tput setaf 2)⦿‿⦿$(tput sgr0)t!"
-printf "\n    ~ Wayne\n"
-
-if [[ "$upgrade_flag" -eq 1 ]] ; then
-  printf "\n$(tput setaf 6)Upgrade Notes\n"
-  printf "\n  * 'rvm notes' tells you OS dependency packages for installing rubies."
-  printf "\n  * If you encounter any issues with a ruby your best bet is to 'rvm remove X ; rvm install X' "
-  printf "\n  * 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"
+
+if [[ ${upgrade_flag:-0} -eq 1 ]] ; then
+
+  upgrade_notes
+
   check_rubyopt_conditions
+
   printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"
 else
-  if [[ "$rvm_selfcontained" = "1" ]] ; then
-    printf "\n$(tput setaf 1)You must now finish the install manually:$(tput sgr0)"
-    printf "\n1) Place the folowing line at the end of your shell's loading files(.bashrc or .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
-    printf "\n     [[ -s \$HOME/.rvm/scripts/rvm ]] && source \$HOME/.rvm/scripts/rvm"
-    printf "\n   Please note that this must only occur once - so, you only need to add it the first time you install rvm."
-    printf "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
-    printf "\n   This means that if you see '[ -z \"\$PS1\" ] && return' then you must change this line to:"
-    printf "\n   if [[ -n \"\$PS1\" ]] ; then"
-    printf "\n     ... original content that was below the && return line ..."
-    printf "\n   fi # <= be sure to close the if."
-    printf "\n   #EOF .bashrc"
-    printf "\n   Be absolutely *sure* to REMOVE the '&& return'."
-    printf "\n   If you wish to DRY up your config you can 'source ~/.bashrc' at the bottom of your .bash_profile."
-    printf "\n   placing all non-interactive items in the .bashrc, including the 'source' line above"
-    printf "\n3) Then $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
+  if [[ ${rvm_selfcontained:-0} -eq 1 ]] ; then
+    installation_complete
   fi
-  if [[ -s "$HOME/.bashrc" ]] && \grep -q '&& return' "$HOME/.bashrc" ; then
-    printf "\n\nWARNING:  you have a 'return' statement in your .bashrc, likely this will cause untold havoc."
-    printf "\n   This means that if you see '[ -z \"\$PS1\" ] && return' then you must change this line to:"
-    printf "\n   if [[ -n \"\$PS1\" ]] ; then"
-    printf "\n     ... original content that was below the && return line ..."
-    printf "\n   fi # <= be sure to close the if."
-    printf "\n   #EOF .bashrc"
-    printf "\nEven if you use zsh you should still adjust the .bashrc as above."
-    printf "\nIf you have any questions about this please visit #rvm on irc.freenode.net.\n"
+
+  if [[ -s "$HOME/.bashrc" ]] && grep -q '&& return' "$HOME/.bashrc" ; then
+    andand_return_warning
   fi
+
   check_rubyopt_conditions
+
   printf "\nInstallation of RVM to $rvm_path/ is complete.\n\n"
 fi
 
+thank_you
+
 exit 0

data/scripts/selector

@@ -2,6 +2,8 @@
 
 # __rvm_select implementation version patch_level
 __rvm_select() {
+
+  # Set Variable Defaults
   rvm_ruby_interpreter=${rvm_ruby_interpreter:-""}
   rvm_head_flag=${rvm_head_flag:-0}
   rvm_install_on_use_flag=${rvm_install_on_use_flag:-0}
@@ -10,6 +12,7 @@ __rvm_select() {
   rvm_ruby_revision=${rvm_ruby_revision:-""}
   rvm_ruby_name=${rvm_ruby_name:-""}
   rvm_ruby_gem_home=${rvm_ruby_gem_home:-""}
+
   export GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION
 
   if [[ -z "${rvm_ruby_string:-""}" ]] ; then
@@ -27,16 +30,20 @@ __rvm_select() {
   case "$rvm_ruby_interpreter" in
     macruby)
       if [[ "Darwin" = "$(uname)" ]] ; then
+
         rvm_ruby_package_name=${rvm_ruby_interpreter}-${rvm_ruby_version}
+
         if [[ $rvm_head_flag -eq 1 ]] ; then
           rvm_ruby_version="" ; rvm_ruby_tag=""
           rvm_ruby_revision="head"
           __rvm_db "macruby_repo_url" "rvm_ruby_repo_url"
           rvm_url="$rvm_ruby_repo_url"
+
         elif [[ "nightly" = "$rvm_ruby_version" ]] ; then
           __rvm_db "macruby_nightly_url" "rvm_url"
           rvm_ruby_package_name="${rvm_ruby_interpreter}_nightly-${rvm_ruby_version}"
           rvm_ruby_package_file="$rvm_ruby_package_name"
+
         else
           __rvm_db "macruby_version" "rvm_ruby_version"
           __rvm_db "macruby_url" "rvm_url"
@@ -55,6 +62,7 @@ __rvm_select() {
       rvm_ruby_interpreter="rbx"
       rvm_ruby_version=${rvm_ruby_version:-$(__rvm_db "rbx_version")}
       rvm_ruby_repo_url=${rvm_rbx_repo_url:-$(__rvm_db "rubinius_repo_url")}
+
       if [[ $rvm_head_flag -eq 0 ]] ; then
         rvm_ruby_patch_level=${rvm_ruby_patch_level:-$(__rvm_db "rbx_patch_level")}
         rvm_ruby_string="${rvm_ruby_string/-prc/-rc}"
@@ -62,6 +70,7 @@ __rvm_select() {
         rvm_ruby_package_file="$(echo "rubinius-${rvm_ruby_version}-${rvm_ruby_patch_level}.${rvm_archive_extension}" | sed 's#-p*#-#' )"
         __rvm_db "rbx_url" "rvm_url"
         rvm_url="$rvm_url/$rvm_ruby_package_file"
+
       else
         rvm_ruby_patch_level="" ; rvm_ruby_version=""
       fi
@@ -69,10 +78,12 @@ __rvm_select() {
 
     jruby)
       rvm_ruby_patch_level=""
+
       if [[ $rvm_head_flag -eq 1 ]] ; then
         rvm_ruby_version="head"
         rvm_ruby_repo_url="${rvm_ruby_repo_url:-$(__rvm_db "jruby_repo_url")}"
         rvm_url="${rvm_ruby_repo_url:-$(__rvm_db "jruby_repo_url")}"
+
       else
         rvm_archive_extension="tar.gz"
         rvm_ruby_version="${rvm_ruby_version:-"$(__rvm_db "jruby_version")"}"
@@ -82,6 +93,7 @@ __rvm_select() {
         rvm_url="${jruby_url}/${rvm_ruby_version}/${rvm_ruby_package_file}.tar.gz"
         jruby_url=""
       fi
+
       alias jruby_ng="jruby --ng"
       alias jruby_ng_server="jruby --ng-server"
     ;;
@@ -89,10 +101,12 @@ __rvm_select() {
     maglev)
       rvm_ruby_patch_level=""
       maglev_url="$(__rvm_db "maglev_url")"
+
       if [[ $rvm_head_flag -eq 1 ]] ; then
         rvm_ruby_version="head"
         rvm_ruby_repo_url="${rvm_ruby_repo_url:-$(__rvm_db "maglev_repo_url")}"
         rvm_url="${rvm_ruby_repo_url:-$(__rvm_db "maglev_repo_url")}"
+
       else
         system="$(uname -s)"
         arch="$(uname -m)"
@@ -108,11 +122,13 @@ __rvm_select() {
 
     ironruby)
       rvm_ruby_patch_level=""
+
       if [[ ${rvm_head_flag:-0} -eq 1 ]] ; then
         rvm_ruby_version="head"
         rvm_ruby_package_name="${rvm_ruby_string}"
         rvm_ruby_repo_url="${rvm_ruby_repo_url:-$(__rvm_db "ironruby_repo_url")}"
         rvm_url="${rvm_ruby_repo_url:-$(__rvm_db "ironruby_repo_url")}"
+
       else
         rvm_archive_extension="zip"
         rvm_ruby_version=${rvm_ruby_version:-"$(__rvm_db "ironruby_version")"}
@@ -120,12 +136,14 @@ __rvm_select() {
         rvm_ruby_package_file="${rvm_ruby_interpreter}-${rvm_ruby_version}.${rvm_archive_extension}"
         rvm_url="$(__rvm_db "ironruby_${rvm_ruby_version}_url")${rvm_ruby_package_file}"
       fi
+
       export rvm_ruby_version rvm_ruby_string rvm_ruby_package_name rvm_ruby_repo_url rvm_url rvm_archive_extension
     ;;
 
     ree)
       rvm_ruby_interpreter=ree
       rvm_ruby_version=${rvm_ruby_version:-"$(__rvm_db "ree_version")"}
+
       if [[ ! -z "$rvm_ruby_patch_level" ]] ; then
         rvm_ruby_patch_level="$(echo $rvm_ruby_patch_level | sed 's#^p##')"
       fi
@@ -134,6 +152,7 @@ __rvm_select() {
         if [[ ! -z "$rvm_ruby_revision" ]] ; then
           rvm_ruby_patch_level="" ; rvm_ruby_package_file=""
           rvm_ruby_package_name="ree-$rvm_ruby_version-$rvm_ruby_revision"
+
         else
           rvm_ruby_package_file="ruby-enterprise-$rvm_ruby_version-$rvm_ruby_patch_level"
           rvm_url="$(__rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_url")/$rvm_ruby_package_file.tar.gz"
@@ -158,8 +177,10 @@ __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"
+
       else
         rvm_ruby_repo_url="${rvm_ruby_repo_url:-"$(__rvm_db "ruby_repo_url")"}"
+
         if [[ ${rvm_head_flag:-0} -eq 0 ]]; then
           rvm_archive_extension="tar.bz2"
         fi
@@ -168,8 +189,10 @@ __rvm_select() {
 
     current)
       ruby_binary="$(command -v ruby)"
+
       if [[ $? -eq 0 ]] && "$rvm_scripts_path/match" "$ruby_binary" "rvm" ; then
         rvm_ruby_string="$(dirname "$ruby_binary" | xargs dirname | xargs basename)"
+
       else
         rvm_ruby_interpreter="system"
       fi
@@ -183,6 +206,7 @@ __rvm_select() {
       if [[ ! -z "$MY_RUBY_HOME" ]] ; then
         rvm_ruby_string=$(basename $MY_RUBY_HOME)
         __rvm_select
+
       else
         if [[ -z "$rvm_ruby_string" ]] ; then
           "$rvm_scripts_path/log" "fail" "Ruby implementation '$rvm_ruby_interpreter' is not known."
@@ -194,6 +218,7 @@ __rvm_select() {
   __rvm_gemset_select
 
   if [[ -n "$rvm_ruby_interpreter" && "system" != "$rvm_ruby_interpreter" && "default" != "$rvm_ruby_interpreter" ]] ; then
+
     if [[ ! -z "$rvm_ruby_version" ]] ; then
       rvm_release_version="${rvm_ruby_version/.*/}"
       rvm_major_version=${rvm_ruby_version%.*} ; rvm_major_version=${rvm_major_version#*.}
@@ -247,6 +272,7 @@ __rvm_use() {
   local new_path=""
 
   if [[ $rvm_ruby_selected_flag -eq 0 ]] ; then __rvm_select "$@" ; fi
+
   if [[ -z "$rvm_ruby_interpreter" ]] ; then rvm_ruby_interpreter="system" ; fi
 
   if [[ "system" = "$rvm_ruby_interpreter" ]] ; then
@@ -254,8 +280,11 @@ __rvm_use() {
     unset GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
 
     new_path="$rvm_bin_path:$(__rvm_remove_rvm_from_path ; printf "$PATH")"
+
     if [[ -s $rvm_config_path/system ]] ; then
+
       \grep "MY_RUBY_HOME='$rvm_rubies_path" "$rvm_config_path/system" > /dev/null
+
       if [[ $? -eq 0 ]] ; then
         [[ -f "$rvm_config_path/system" ]] && \rm -f $rvm_config_path/system # 'system' should *not* point to an rvm ruby.
       else
@@ -266,8 +295,11 @@ __rvm_use() {
     # Check binaries, remove under the condition they're symlinks.
     local binary full_binary_path
     if [[ "$rvm_selfcontained" = "0" ]] ; then
+
       for binary in ruby gem irb ri rdoc rake erb testrb ; do
+
         full_binary_path="$rvm_bin_path/$binary"
+
         [[ -L "$full_binary_path" ]] && \rm -f "$full_binary_path"
       done
     fi
@@ -539,6 +571,7 @@ __rvm_ruby_string() {
     patch_level="$(__rvm_db "${rvm_ruby_interpreter}_${rvm_ruby_version}_patch_level")"
 
     if [[ -n "${patch_level:-""}" ]] ; then
+
       if [[ "ree" = "$rvm_ruby_interpreter" ]] || [[ "rbx" = "$rvm_ruby_interpreter" ]] ; then
         rvm_ruby_patch_level="${patch_level}"
       else
@@ -547,10 +580,13 @@ __rvm_ruby_string() {
     fi
 
     if [[ -n "${rvm_ruby_patch_level:-""}" ]] ; then
+
       rvm_ruby_patch_level="$(echo $rvm_ruby_patch_level | sed 's#^pp#p#')"
       rvm_ruby_string="${rvm_ruby_string}-${rvm_ruby_patch_level}"
+
       if [[ "ree" = "${rvm_ruby_interpreter:-""}" ]] || [[ "rbx" = "${rvm_ruby_interpreter:-""}" ]] ; then
         rvm_ruby_string="$(echo $rvm_ruby_string | sed 's#-p*#-#')"
+
       else
         rvm_ruby_string="$(echo $rvm_ruby_string | sed 's#-pp#-p#')"
         rvm_ruby_string="$(echo $rvm_ruby_string | sed 's#-prc#-rc#')"
@@ -575,9 +611,11 @@ __rvm_gemset_select() {
   rvm_ruby_global_gems_path="$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator}global"
 
   if [[ -z "${rvm_gemset_name:-""}" ]] ; then
+
     # No longer defaulting to 'sticky' gem sets.
     # Set 'rvm_sticky_flag=1' in ~/.rvmrc to enable.
     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}')
       fi
@@ -589,26 +627,33 @@ __rvm_gemset_select() {
 
     if [[ -n "${rvm_gemset_name:-""}" ]] && ! "$rvm_scripts_path/match" "$rvm_gemset_name" "^[0-9]\.[0-9]" ; then
       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
         rvm_ruby_gem_home="$rvm_gems_path/$rvm_ruby_string"
+
       elif [[ -z "${GEM_HOME:-""}" ]]  && [[ -n "$(command -v gem)" ]] ; then
         rvm_ruby_gem_home=$(gem env gemdir)
+
       elif [[ -n "${GEM_HOME:-""}" ]] ; then
         rvm_ruby_gem_home="$GEM_HOME"
+
       else
         rvm_ruby_gem_home=""
       fi
     fi
   else
     local gemset=$(echo "$rvm_ruby_gem_home" | awk -F'@' '{print $NF}')
+
     if [[ -z "${rvm_ruby_string:-""}" && -n "${GEM_HOME:-""}" && -n "${GEM_HOME/@*/}" ]] ; then
       rvm_ruby_string=$(basename ${GEM_HOME/@*/})
     fi
 
     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}"
+
       elif [[ -n "${gemset:-""}" && "${rvm_gemset_name:-""}" != "${gemset:-""}" ]] ; then
         rvm_ruby_gem_home="$rvm_gems_path/${rvm_ruby_string}${rvm_gemset_separator}${rvm_gemset_name}"
       fi
@@ -641,7 +686,7 @@ __rvm_gemset_select() {
   \mkdir -p "$rvm_ruby_gem_home"
   if [[ -n "${rvm_ruby_gem_home:-""}" ]] && echo "$rvm_ruby_gem_home" | \grep -q 'rvm'; then
     if __rvm_using_gemset_globalcache && [[ ! -L "$rvm_ruby_gem_home/cache" ]]; then
-      mv "$rvm_ruby_gem_home/cache/"*.gem "$rvm_gems_cache_path/" 2>/dev/null
+      \mv "$rvm_ruby_gem_home/cache/"*.gem "$rvm_gems_cache_path/" 2>/dev/null
       \rm -rf "$rvm_ruby_gem_home/cache"
       \ln -nfs "$rvm_gems_cache_path" "$rvm_ruby_gem_home/cache"
     fi
@@ -652,12 +697,16 @@ __rvm_gemset_select() {
 
 # Use a gemset specified by 'rvm_ruby_gem_home'
 __rvm_gemset_use() {
-  rvm_verbose_flag=${rvm_verbose_flag:-0}
-  rvm_ruby_gem_home=${rvm_ruby_gem_home:-""}
+  if [[ -z "${rvm_gemset_name:-""}" ]] ; then
+    "$rvm_scripts_path/log" "error" "Gemset was not given.\n  Usage:\n    rvm gemset use <gemsetname>\n"
+    return 1
+  fi
+
+  if [[ -n "${rvm_ruby_gem_home:-""}" ]] ; then
 
-  if [[ -n "$rvm_ruby_gem_home" ]] ; then
     if [[ ! -d "$rvm_ruby_gem_home" ]] ; then
-      if [[ "$rvm_gemset_create_on_use_flag" -eq 1 ]] || [[ "$rvm_create_flag" -eq 1 ]]; then
+
+      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"
       else
         "$rvm_scripts_path/log" "error" "Gemset '$rvm_gemset_name' does not exist, rvm gemset create '$rvm_gemset_name' first."
@@ -665,11 +714,11 @@ __rvm_gemset_use() {
       fi
     fi
 
-    if [[ "$rvm_interactive_flag" -eq 1 ]] || [[ "$rvm_verbose_flag" -eq 1 ]] ; then
+    if [[ ${rvm_interactive_flag:-0} -eq 1 && ${rvm_verbose_flag:-1} -ne 0 ]] ; then
       "$rvm_scripts_path/log" "info" "Now using gemset '${rvm_gemset_name:-default}'"
     fi
 
-    rvm_ruby_gem_home="$(echo "$GEM_HOME" | sed 's/'${rvm_gemset_separator}'.*$//')${rvm_gemset_separator}${rvm_gemset_name}"
+    rvm_ruby_gem_home="$(echo "${GEM_HOME:-""}" | sed 's/'${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"