list in rvm-1.0.5

- old
+ new

@@ -4,11 +4,11 @@
 
 rvm_base_except="selector"
 source "$rvm_scripts_path/base"
 
 list_gemsets() {
-  if [[ "$1" = "strings" ]]; then
+  if [[ "${1:-""}" = "strings" ]]; then
     list_gemset_strings
     return 0
   fi
   echo
 
@@ -55,18 +55,23 @@
   fi ; unset current_ruby version selected system_ruby system_version string binary
   printf "\n\n"
 }
 
 list_default() {
-  if [[ "$1" = "string" ]] ; then
+  if [[ "${args[0]:-""}" = "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" ' ')]"
+
         if [[ $rvm_pretty_print -eq 1 ]] ; then
           printf "\n   $(tput setaf 2)$version$(tput sgr0) $string\n"
         else
           printf "\n   $version $string\n"
         fi
@@ -104,11 +109,11 @@
 list_known_strings() {
   sed -e 's/#.*$//g' -e 's/(//g' -e 's/)//g' < "$rvm_config_path/known" | sort -r | uniq
 }
 
 list_known() {
-  if [[ "$1" = "strings" ]]; then
+  if [[ "${1:-""}" = "strings" ]]; then
     list_known_strings
     return 0
   fi
 
   if [[ "$rvm_interactive_flag" != "1" ]] ; then
@@ -122,13 +127,12 @@
 list_rubies_strings() {
   find "$rvm_rubies_path/" -type d -maxdepth 1 | tail -n+2 | xargs -n1 basename -- |  __rvm_strip
 }
 
 list_rubies() {
+  if [[ "${1:-""}" = "strings" ]]; then list_rubies_strings ; return 0 ; fi
 
-  if [[ "$1" = "strings" ]]; then list_rubies_strings ; return 0 ; fi
-
   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
@@ -169,12 +173,12 @@
 
 # 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.
 args=($*)
-action="${args[0]}"
-args="$(echo ${args[@]:1}) " # Strip trailing / leading / extra spacing.
+action="${args[0]:-""}"
+args=${args[@]:1} # Strip trailing / leading / extra spacing.
 
 if [[ "known" = "$action" ]] ; then
   list_known
 elif [[ "known_strings" = "$action" ]] ; then
   list_known_strings
@@ -190,10 +194,10 @@
   list_ruby_svn_tags
 else # help
   printf "
   Usage:
 
-    rvm list {known,gemsets,default,rubies,strings,known_strings}
+    rvm list {known,gemsets,default [string],rubies,strings,known_strings}
 
 "
   false
 fi
 