rvm-install in rvm-1.1.4

- old
+ new

@@ -3,12 +3,11 @@
 set -o errtrace
 
 export PS4='+[${BASH_SOURCE}] : ${LINENO} : ${FUNCNAME[0]:+${FUNCNAME[0]}() $ }'
 
 if [[ -z "$rvm_selfcontained" ]]; then
-  if [[ "root" = "$(whoami)" \
-    || -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
+  if [[ $(id -u) -eq 0 || -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
     export rvm_selfcontained=0
   else
     export rvm_selfcontained=1
   fi
 fi
@@ -124,10 +123,10 @@
 }
 
 thank_you()
 {
   printf "
-${name:-"${USER:-$(whoami)}"},
+${name:-"${USER:-$(id | sed -e 's/^[^(]*(//' -e 's/).*$//')}"},
 
 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