rvm 0.1.32 → 0.1.33

data/scripts/help

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+source $rvm_scripts_path/initialize
+
+if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
+
+trap "if [[ -d $rvm_tmp_path/ ]] && [[ -s $rvm_tmp_path/$$ ]] ; then rm -f $rvm_tmp_path/$$ > /dev/null 2>&1 ; fi ; exit" 0 1 2 3 15
+
+rvm_help_path="${rvm_help_path:-"$rvm_path/help"}"
+
+command="$(echo $* | awk '{print $1}')"
+action="$(echo $* | awk '{print $2}')"
+# Reserved for future use:
+args=$(echo "$*" | awk '{$1=""; $2="" ; print}' | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
+
+if [[ ! -z "$command" ]] && [[ -s "${rvm_help_path}/${command}" ]] ; then
+  if [[ ! -z "$action" ]] && [[ -s "${rvm_help_path}/${command}/${action}" ]] ; then
+    cat "${rvm_help_path}/${command}/${action}" | ${PAGER:-less}
+  else
+    cat "${rvm_help_path}/${command}" | ${PAGER:-less}
+  fi
+else
+  cat "${rvm_path:-$HOME/.rvm}/README" | ${PAGER:-less}
+  $rvm_scripts_path/log "info" "\nCommands available with 'rvm help':\n\n $(builtin cd "${rvm_help_path}" ; \ls | tr "\n" ' ')"
+fi
+
+$rvm_scripts_path/log "info" "\nFor additional information please visit RVM's documentation website:\n\n    http://rvm.beginrescueend.com/"
+$rvm_scripts_path/log "info" "\nIf you still cannot find what an answer to your question, find me 'wayneeseguin' in #rvm on irc.freenode.net:\n\n    http://webchat.freenode.net/?channels=rvm\n"
+
+exit $?

data/scripts/info

@@ -0,0 +1,142 @@
+#!/usr/bin/env bash
+
+source $rvm_scripts_path/initialize
+source $rvm_scripts_path/utility
+source $rvm_scripts_path/selector
+source $rvm_scripts_path/version
+
+if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
+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
+
+info_system() {
+  rvm_info="$rvm_info\n  system:\n    uname:        \"$(uname -a)\""
+
+  if [[ ! -z "$ZSH_VERSION" ]]  ; then
+    rvm_info="$rvm_info\n    shell:        \"zsh\"\n     version:      \"$ZSH_VERSION\""
+  fi
+
+  if [[ ! -z "$BASH_VERSION" ]] ; then
+    rvm_info="$rvm_info\n    shell:        \"bash\"\n    version:      \"$BASH_VERSION\""
+  fi
+  rvm_info="$rvm_info\n"
+}
+
+info_rvm() {
+  rvm_info="$rvm_info\n  rvm:"
+  rvm_info="$rvm_info\n    type:         \"$(head -n 1 < <(type rvm))\""
+  rvm_info="$rvm_info\n    version:      \"$(__rvm_version | tr "\n" ' ' | sed 's/^[[:space:]]*//' | sed 's/[[:space:]]*$//')\""
+  rvm_info="$rvm_info\n"
+}
+
+info_ruby() {
+  ruby=$(command -v ruby)
+  if [[ $? -eq 0 ]] && [[ -x "$ruby" ]] ; then full_version="$($ruby -v)" ; fi
+  rvm_info="$rvm_info\n  ruby:"
+  rvm_info="$rvm_info\n    interpreter:  \"$(printf "${full_version}" | awk '{print $1}')\""
+  rvm_info="$rvm_info\n    version:      \"$(printf "${full_version}" | awk '{print $2}')\""
+  rvm_info="$rvm_info\n    date:         \"$(printf "${full_version}" | sed 's/^.*(\([0-9]\{4\}\(-[0-9][0-9]\)\{2\}\).*$/\1/')\""
+  rvm_info="$rvm_info\n    platform:     \"$(printf "${full_version}" | sed 's/^.*\[//' | sed 's/\].*$//')\""
+  rvm_info="$rvm_info\n    patchlevel:   \"$(printf "${full_version}" | sed 's/^.*(//' | sed 's/).*$//')\""
+  rvm_info="$rvm_info\n    full_version: \"${full_version}\""
+  rvm_info="$rvm_info\n"
+}
+
+info_homes() {
+  rvm_info="$rvm_info\n  homes:"
+  rvm_info="$rvm_info\n    gem:          \"${GEM_HOME:-'not set'}\""
+  rvm_info="$rvm_info\n    ruby:         \"${MY_RUBY_HOME:-'not set'}\""
+  rvm_info="$rvm_info\n"
+}
+
+info_binaries() {
+  rvm_info="$rvm_info\n  binaries:"
+  rvm_info="$rvm_info\n    ruby:         \"$(command -v ruby)\""
+  rvm_info="$rvm_info\n    irb:          \"$(command -v irb)\""
+  rvm_info="$rvm_info\n    gem:          \"$(command -v gem)\""
+  rvm_info="$rvm_info\n    rake:         \"$(command -v rake)\""
+  rvm_info="$rvm_info\n"
+}
+
+info_environment() {
+  rvm_info="$rvm_info\n  environment:"
+  rvm_info="$rvm_info\n    GEM_HOME:     \"$GEM_HOME\""
+  rvm_info="$rvm_info\n    GEM_PATH:     \"$GEM_PATH\""
+  rvm_info="$rvm_info\n    BUNDLE_PATH:  \"$BUNDLE_PATH\""
+  rvm_info="$rvm_info\n    MY_RUBY_HOME: \"$MY_RUBY_HOME\""
+  rvm_info="$rvm_info\n    IRBRC:        \"$IRBRC\""
+  rvm_info="$rvm_info\n    RUBYOPT:      \"$RUBYOPT\""
+  rvm_info="$rvm_info\n    gemset:       \"$(printf $GEM_HOME | awk -F${rvm_gemset_separator:-'@'} '{print $2}')\"\n"
+  if [[ ! -z "$MAGLEV_HOME" ]] ; then
+    rvm_info="$rvm_info\n  MAGLEV_HOME: \"$MAGLEV_HOME\""
+  fi
+  rvm_info="$rvm_info\n"
+}
+
+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\nuname -a: $(uname -a)"
+  rvm_info="$rvm_info\npermissions: $(\ls -la $rvm_path{,/rubies})"
+
+  if [[ "Darwin" = "$(uname)" ]] ; then
+    rvm_info="$rvm_info\nuname -r: $(uname -r)"
+    rvm_info="$rvm_info\nuname -m: $(uname -m)"
+    rvm_info="$rvm_info\nsw_vers: $(sw_vers | tr "\n" ',')"
+    rvm_info="$rvm_info\nARCHFLAGS: $ARCHFLAGS"
+    rvm_info="$rvm_info\nLDFLAGS: $LDFLAGS"
+    rvm_info="$rvm_info\nCFLAGS: $CFLAGS"
+    rvm_info="$rvm_info\n/Developer/SDKs/*:$(/usr/bin/basename -a /Developer/SDKs/* | tr "\n" ',')"
+  fi
+
+  for file_name in $(echo $rc_files) ; do
+    if [[ -s "$file_name" ]] ; then
+      rvm_info="$rvm_info\n$( "$file_name:\n$(grep 'rvm' $file_name 2>/dev/null)" )"
+    fi
+  done
+
+  if [[ "root" = "$(whoami)" ]] ; then
+    debug_files="$rvm_config_path/alias $rvm_config_path/system $rvm_config_path/db /etc/rvmrc /etc/gemrc"
+  else
+    debug_files="$rvm_config_path/alias $rvm_config_path/system $rvm_config_path/db $HOME/.rvmrc $HOME/.gemrc"
+  fi
+
+  for file_name in $(echo $debug_files); do
+    if [[ -f "$file_name" ]] && [[ -s "$file_name" ]] ; then
+      rvm_info="$rvm_info\n$file_name \(filtered\):\n$(cat $file_name | awk '!/assword|_key/')\n"
+    fi
+  done
+
+  rvm_info="$rvm_info\ngem sources:\n$(gem sources | awk '/gems/')"
+}
+
+info_sections() {
+  for section in $(echo $sections | tr ',' ' ') ; do
+    unset rvm_info ; "info_${section}" ; printf "$rvm_info"
+  done
+}
+
+args="$*"
+ruby_strings="$(echo "$args" | awk '{print $1}')"
+sections=$(echo "$args" | awk '{$1="" ; print}' | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
+all_sections="system rvm ruby homes binaries environment"
+
+if $rvm_scripts_path/match "$all_sections debug" "${ruby_strings/,*/}" ; then
+  sections="$ruby_strings"
+  ruby_strings=""
+fi
+
+if [[ -z "$sections" ]] ; then sections="$all_sections" ; fi
+
+if [[ -z "$ruby_strings" ]] ; then
+  printf "${rvm_ruby_string}:\n"
+  info_sections
+else
+  for ruby_string in $(printf $ruby_strings | tr ',' ' ') ; do
+    rvm_ruby_string="${ruby_string}" ;  __rvm_select ; __rvm_use
+    printf "${rvm_ruby_string}:\n"
+    info_sections
+  done
+fi

data/scripts/initialize

@@ -17,14 +17,16 @@ rvm_log_path="${rvm_log_path:-"$rvm_path/log"}"
 rvm_docs_path="${rvm_docs_path:-"$rvm_path/docs"}"
 rvm_bin_path="${rvm_bin_path:-"$rvm_path/bin"}"
 rvm_gems_path="${rvm_gems_path:-"$rvm_path/gems"}"
+rvm_gemsets_path="${rvm_gemsets_path:-"$rvm_path/gemsets"}"
 rvm_gems_cache_path="${rvm_gems_cache_path:-"$rvm_gems_path/cache"}"
 rvm_rubies_path="${rvm_rubies_path:-"$rvm_path/rubies"}"
 rvm_config_path="${rvm_config_path:-"$rvm_path/config"}"
+rvm_environments_path="${rvm_environments_path:-"$rvm_path/environments"}"
+rvm_wrappers_path="${rvm_wrappers_path:-"$rvm_path/wrappers"}"
 rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
 rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
 rvm_usr_path="${rvm_usr_path:-"$rvm_path/usr"}"
-rvm_symlink_path="${rvm_symlink_path:-$rvm_prefix/bin}"
 rvm_gemset_separator="${rvm_gemset_separator:-"@"}"
 
-export rvm_path rvm_rubies_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_log_path rvm_bin_path rvm_gems_path rvm_config_path rvm_tmp_path rvm_hooks_path rvm_gems_cache_path rvm_gemset_separator rvm_symlink_path
+export rvm_path rvm_rubies_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_log_path rvm_bin_path rvm_gems_path rvm_config_path rvm_tmp_path rvm_hooks_path rvm_gems_cache_path rvm_gemset_separator
 

data/scripts/install

@@ -11,7 +11,7 @@ source scripts/version
 source scripts/utility
 
 usage() {
-  echo -e "
+  printf "
   Usage:
     ${0} [options]
 
@@ -27,7 +27,7 @@ spinner_counter=0
 spinner() {
   array=('/' '-' '\\' '|' '/' '-' '\\' '|')
   index=$((($spinner_counter % 8)))
-  echo -e -n "\r${array[$index]}"
+  printf "\r${array[$index]}"
   let "spinner_counter=spinner_counter+1"
   command -v perl > /dev/null 2>&1 && perl -e 'sleep 0.5'
 }
@@ -86,19 +86,17 @@ 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"}"
-rvm_symlink_path="${rvm_symlink_path:-$rvm_prefix/bin}"
 
 export rvm_gemset_separator="@" # TODO: Remove this after a while.
 
-echo -e "\n$(tput setaf 2)RVM$(tput sgr0) - shell scripts which allow management of multiple ruby interpreters and environments."
-echo -e "\n    $(tput setaf 2)RTFM: $(tput sgr0) http://rvm.beginrescueend.com/"
-echo -e "\n    $(tput setaf 2)HELP: $(tput sgr0) http://webchat.freenode.net/?channels=rvm (#rvm on irc.freenode.net)"
+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)"
 
-echo -e "\n********************************************************************************"
 if [[ "$upgrade_flag" -eq 1 ]] ;then
-  echo -e -n "  Upgrading the RVM installation in $rvm_path/"
+  printf "\n\n  Upgrading the RVM installation in $rvm_path/"
 else
-  echo -e -n "  Installing rvm to $rvm_path/"
+  printf "\n\n  Installing rvm to $rvm_path/"
 fi
 
 spinner
@@ -150,19 +148,19 @@ chmod +x $rvm_bin_path/*
 #
 spinner
 if [[ ! -z "$rvm_auto_flag" ]] ; then
-  echo -e "Checking rc files... ($rvm_rc_files)"
+  printf "Checking rc files... ($rvm_rc_files)"
   if [[ "$rvm_loaded_flag" != "1" ]] ; then
     for rcfile in $(echo $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."
-          echo -e "\n# rvm-install added line:\nif [[ -s \$HOME/.profile ]] ; then source \$HOME/.profile ; fi\n" >> $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."
-        echo -e "\n# rvm-install added:\nif [[ -s $rvm_scripts_path/rvm ]] ; then source $rvm_scripts_path/rvm ; fi\n" >> $rcfile
+        printf "\n# rvm-install added:\nif [[ -s $rvm_scripts_path/rvm ]] ; then source $rvm_scripts_path/rvm ; fi\n" >> $rcfile
       fi
     done
   fi
@@ -196,12 +194,12 @@ done
 # Migrate old gemset directories to new gemset pattern.
 #
 spinner
-echo -e -n "\r*" # Stop 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
-    echo -e "    Renaming $(basename $gemset) to $(basename $new_path) for new gemset separator."
+    printf "\n    Renaming $(basename $gemset) to $(basename $new_path) for new gemset separator."
     mv $gemset $new_path
   fi
 done
@@ -209,22 +207,26 @@ done
 for gemset in $rvm_path/gems/*\+* ; do
   new_path=${gemset/\+/${rvm_gemset_separator}}
   if [[ -d "$gemset" ]] && [[ ! -d "$new_path" ]] ; then
-    echo -e "    Renaming $(basename $gemset) to $(basename $new_path) for new gemset separator."
+    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
-    echo -e "    Fixing: $(basename $gemset) to $(basename $new_path) for new gemset separator."
+    printf "\n    Fixing: $(basename $gemset) to $(basename $new_path) for new gemset separator."
     mv $gemset $new_path
   fi
 done
 
-# Upgrade any default file.
-if [[ -s $rvm_config_path/default ]] && grep -q '\%' $rvm_config_path/default ; then
-  sed -e "s#\%#${rvm_gemset_separator}#g" $rvm_config_path/default > $rvm_config_path/default.new
-  mv $rvm_config_path/default.new $rvm_config_path/default
+# 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}#")")"
+  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"
 fi
 
 #
@@ -232,64 +234,60 @@ fi
 #
 
 if [[ "root" = "$(whoami)" ]] ; then
-  echo -e "\n    Symlinking rvm to $rvm_symlink_path/rvm ..."
-  mkdir -p $rvm_symlink_path
-  ln -nfs $rvm_bin_path/rvm $rvm_symlink_path/rvm
-  ln -nfs $rvm_bin_path/rvmsudo $rvm_symlink_path/rvmsudo
-  chmod +x $rvm_symlink_path/rvm
-  chmod +x $rvm_symlink_path/rvmsudo
+  printf "\n    Symlinking rvm to $rvm_bin_path/rvm ..."
+  mkdir -p $rvm_bin_path
+  chmod +x $rvm_bin_path/rvm
+  chmod +x $rvm_bin_path/rvmsudo
 fi
 
 if [[ "$upgrade_flag" -eq 0 ]] ; then
-  echo -e "\n********************************************************************************"
   ./scripts/notes
 fi
 
-echo -e "\n********************************************************************************"
 name="$(awk -F= '/^[[:space:]]*name/{print $2}' ~/.gitconfig 2>/dev/null)"
-echo -e "\n${name:-"$(whoami)"},\n"
-echo -e "\nThank you for using rvm. I hope that it makes your work easier and more enjoyable."
-echo -e "If you have any questions, issues and/or ideas for improvement please hop in #rvm on irc.freenode.net and let me know."
-echo -e "My irc nickname is 'wayneeseguin' and I hang out from ~09:00-17:00EST and again from ~21:00EST-~00:00EST."
-echo -e "If I do not respond right away, please hang around after asking your question, I will respond as soon as I am back."
-echo -e "Be sure to get head often as rvm development happens fast, you can do this by typing 'rvm update --head'."
-echo -e "\n  w$(tput setaf 2)⦿‿⦿$(tput sgr0)t!"
-echo -e "\n    ~ Wayne"
-echo -e "\n********************************************************************************"
+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 typing 'rvm update --head'."
+printf "\n  w$(tput setaf 2)⦿‿⦿$(tput sgr0)t!"
+printf "\n    ~ Wayne\n"
 
 if [[ "$upgrade_flag" -eq 1 ]] ; then
-  echo -e "\n$(tput setaf 6)**** NOTICE *************************************************************************************"
-  echo -e "*  Gemset separator has changed, it is now @ and will remain unless any rubies error using it.  *"
-  echo -e "*  If you encounter any issues with a ruby your best bet is to 'rvm remove X ; rvm install X'   *"
-  echo -e "*************************************************************************************************$(tput sgr0)\n"
-  echo -e "Upgrade of RVM in $rvm_path/ is complete.\n"
+  printf "\n$(tput setaf 6)Upgrade Notes\n"
+  printf "\n  * Gemset separator is '@' and will remain unless any rubies error using it."
+  printf "\n  * If you encounter any issues with a ruby your best bet is to 'rvm remove X ; rvm install X' "
+  printf "\n  * Do not forget that 'rvm notes' tells you OS dependency packages for installing rubies."
+  printf "\n$(tput sgr0)\n"
+  printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"
 else
   if [[ "root" != "$(whoami)" ]] ; then
-    echo -e "\n$(tput setaf 1)You must now finish the install manually:$(tput sgr0)"
-    echo -e "\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:"
-    echo -e "\n     if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
-    echo -e "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
-    echo -e "\n   This means that if you see '[ -z "$PS1" ] && return' then you must change this line to:"
-    echo -e "\n   if [[ ! -z "$PS1" ]] ; then"
-    echo -e "\n     ... original content that was below the && return line ..."
-    echo -e "\n   fi # <= be sure to close the if."
-    echo -e "\n   #EOF .bashrc"
-    echo -e "\n   Be absolutely *sure* to REMOVE the '&& return'."
-    echo -e "\n   If you wish to DRY up your config you can 'source ~/.bashrc' at the top of your .bash_profile."
-    echo -e "\n   placing all non-interactive items in the .bashrc"
-    echo -e "\n3) Then $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
+    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     if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
+    printf "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
+    printf "\n   This means that if you see '[ -z "$PS1" ] && return' then you must change this line to:"
+    printf "\n   if [[ ! -z "$PS1" ]] ; then"
+    printf "\n     ... 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 top of your .bash_profile."
+    printf "\n   placing all non-interactive items in the .bashrc"
+    printf "\n3) Then $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
   fi
   if [[ -s $HOME/.bashrc ]] && grep '&& return' $HOME/.bashrc ; then
-    echo -e "\n\nWARNING:  you have a 'return' statement in your .bashrc, likely this will cause untold havoc.
-       This means that if you see '[ -z "\$PS1" ] && return' then you must change this line to:
-       if [[ -n "\$PS1" ]] ; then
-         ... original content that was below the && return line ...
-       fi # <= be sure to close the if.
-       #EOF .bashrc
-
-    If you have any questions about this please visit #rvm on irc.freenode.net.\n"
+    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"
   fi
-  echo -e "Installation of RVM to $rvm_path/ is complete.\n\n"
+  printf "\nInstallation of RVM to $rvm_path/ is complete.\n\n"
 fi
 
 exit 0

data/scripts/list

@@ -0,0 +1,102 @@
+#!/usr/bin/env bash
+
+if [[ "$rvm_trace_flag" -eq 2 ]] ; then set -x ; export rvm_trace_flag ; fi
+
+# Query for valid rvm ruby strings
+# This is meant to be used with scripting.
+__rvm_list_strings() {
+  echo $(\ls $rvm_rubies_path)
+}
+
+__rvm_list_default() {
+  strings="$(echo $rvm_ruby_args | awk '{print $2}')"
+  if [[ "$strings" = "string" ]] ; then
+    $rvm_scripts_path/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)
+      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"
+      fi ; unset version
+    fi
+  fi
+}
+
+__rvm_list_known() {
+  while read -r tag
+  do
+    prefix="$(echo ${tag/\//} | sed 's#^v1_##' | awk -F'_' '{print "(ruby-)1."$1"."$2}' | sed 's#p$##')"
+    echo "${prefix}-t${tag/\//}"
+    unset prefix tag
+  done < <(svn list http://svn.ruby-lang.org/repos/ruby/tags/ | awk '/^v1_[8|9]/')
+  printf "\n(ruby-)1.8.6(-p399)\n(ruby-)1.8.6-head\n(ruby-)1.8.7(-p249)\n(ruby-)1.8.7-head\n(ruby-)1.9.1(-p243)\n(ruby-)1.9.1(-p376)\n(ruby-)1.9.1-head\n(ruby-)1.9.2-preview1\n(ruby-)1.9.2-head\nruby-head\n"
+  printf "\njruby-1.2.0\njruby-1.3.1\njruby-1.4.0\njruby(-1.5.0) # the default\njruby-head"
+  printf "\nrbx(-1.0.0) # default\nrbx-head"
+  printf "\nree-1.8.6\nree(-1.8.7) # the default\nree-1.8.6-head\nree-1.8.7-head"
+  printf "\nmaglev(-23530)\nmaglev-head"
+  printf "\nmput(-head) # shyouhei head, the default mput"
+  printf "\nironruby-0.9.3\nironruby-1.0-rc2\nironruby-head"
+  if [[ "Darwin" = "$(uname)" ]] ; then
+    printf "\nmacruby(-nightly) # the default macruby\nmacruby-head # Build from the macruby git repository"
+  fi
+}
+
+__rvm_list_rubies() {
+  echo
+  ruby=$(command -v ruby) ; current_ruby=""
+  if [[ ! -z "$ruby" ]] && [[ ! -z "$(echo $ruby | awk '/rvm/')" ]] ; then
+    current_ruby="$(echo $ruby | xargs dirname | xargs dirname | xargs basename 2> /dev/null)"
+  fi
+
+  printf "rvm rubies\n"
+  for version in $(\ls $rvm_rubies_path/ 2> /dev/null | awk '/[a-z]*-.*/ {print $NF}') ; do
+    if [[ ! -z "$(echo $version | awk '/^jruby-/')" ]] ; then
+      string="[ $($rvm_rubies_path/$version/bin/ruby -v | awk '{print $NF}') ]"
+    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" ' ')]"
+    fi
+    printf "\n"
+    if [[ "$version" = "$current_ruby" ]]; then
+      printf "=> "
+    else
+      printf "   "
+    fi
+    printf "$(tput setaf 2)$version$(tput sgr0) $string"
+  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)
+    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"
+    fi ; unset version
+  fi
+  printf "\n"
+
+  unset current_ruby version selected system_ruby system_version string binary
+  echo
+}
+
+# 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="$(echo "$1" | awk '{print $1}')"
+
+if [[ "known" = "$action" ]] ; then
+  __rvm_list_known
+elif [[ "default" = "$action" ]] ; then
+  __rvm_list_default
+elif [[ -z "$action" ]] || [[ "rubies" = "$action" ]] ; then
+  __rvm_list_rubies
+elif [[ "strings" = "$action" ]] ; then
+  __rvm_list_strings
+else # help
+  printf "\nUsage:  rvm list {known,default,rubies,strings}"
+fi
+
+exit $?