scripts/utility in rvm-0.0.92 vs scripts/utility in rvm-0.0.93

@@ -287,11 +287,11 @@
 
     for version in $(\ls $rvm_path/ 2> /dev/null | awk '/[a-z]*-.*/ {print $NF}') ; do
       if [[ ! -z "$(echo $version | awk '/^jruby-/')" ]] ; then
         string="$($version -v | awk '{print $NF}')"
       else
-        string="[$(file $rvm_path/$version/bin/ruby | awk -F: '{print $2}' | awk '{print $NF}')]"
+        string="[ $(file $rvm_path/$version/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
       fi
       if [[ "$version" = "$current_ruby" ]] ; then
         echo -e "=> $(tput setaf 2)$version$(tput sgr0) $string"
         selected="1"
       else
@@ -300,27 +300,29 @@
     done ; unset version
 
     if [[ -f "$rvm_path/default" ]] && [[ -s $rvm_path/default ]] ; then
       version=$(grep '^MY_RUBY_HOME' $rvm_path/default | awk -F"'" '{print $2}' | xargs basename)
       if [[ ! -z "$version" ]] ; then
-        string=$(file $rvm_path/$version/bin/ruby)
+        string="[ $(file $rvm_path/$version/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
         if [[ "$version" = "$current_ruby" ]] ; then
           echo -e "=> $(tput setaf 3)(default)$(tput sgr0) $(tput setaf 2)$version$(tput sgr0) $string"
           selected="1"
         else
           echo -e "   $(tput setaf 3)(default)$(tput sgr0) $(tput setaf 2)$version$(tput sgr0) $string"
         fi
       fi ; unset version
     fi
 
     system_ruby="$(rvm system ; which ruby 2>/dev/null)"
-    if [[ ! -z "$system_ruby" ]] ; then
-      system_version=$(file $(which ruby) | awk -F: '{print $2}' | grep 8 | awk '{print $NF}' | tr "\n" ' ')
-      if [[ ! -z "$(which ruby 2>/dev/null)" ]] && [[ "$($(which ruby 2>/dev/null) -v)" = "$system_version" ]] ; then
-        echo -e "=> $(tput setaf 2)system$(tput sgr0) [$system_version]\n"
+    if [[ ! -z "$system_ruby" ]] && [[ -x "$system_ruby" ]]; then
+      #system_version=$($system_ruby -v | awk -F: '{print $2}' | grep 8 | awk '{print $NF}' | tr "\n" ' ')
+      system_version=$($system_ruby -v)
+      string="[ $(file $system_ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | tr "\n" ' ')]"
+      if [[ ! -z "$system_ruby" ]] && [[ "$system_ruby -v)" = "$system_version" ]] ; then
+        echo -e "=> $(tput setaf 2)system$(tput sgr0) $string\n"
       else
-        echo -e "   $(tput setaf 2)system$(tput sgr0) [$system_version]\n"
+        echo -e "   $(tput setaf 2)system$(tput sgr0) $string\n"
       fi
     else
       $rvm_scripts_path/log "info" "No system ruby found."
     fi
 
@@ -355,10 +357,10 @@
 
 __rvm_update_rvm() {
   mkdir -p "$rvm_src_path"
   __rvm_pushpop "$rvm_src_path"
 
-  ruby="$(which ruby)"
+  ruby="$(which ruby 2>/dev/null)"
   system_ruby="$(rvm system ; which ruby 2>/dev/null)"
   if [[ ! -x "$ruby" ]] ; then
     if [[ ! -x "$system" ]] ; then
       unset ruby
     else