scripts/cli in rvm-1.0.9 vs scripts/cli in rvm-1.0.10

@@ -394,16 +394,18 @@
       --archflags)
         rvm_archflags="$next_token"
         if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
       ;;
 
+      --debug)
+        export rvm_debug_flag=1
+        set -o verbose
+      ;;
+
       --trace|--debug)
         local option
 
-        export rvm_debug_flag=1
-
-        set -o verbose
         set -o noclobber
         set -o nounset
 
         if [[ -z "${ZSH_VERSION:-""}" ]] ; then
           set -o errtrace
@@ -412,14 +414,14 @@
         # errexit pipefail
         if [[ "$rvm_token" = "--trace" ]] ; then
 
           export rvm_trace_flag=1
 
-          #set -o xtrace
+          set -o xtrace
 
           if [[ -z "${ZSH_VERSION:-""}" ]] ; then
-            export PS4='-[${BASH_SOURCE}] : ${LINENO} : ${FUNCNAME[0]:+${FUNCNAME[0]}() > }'
+            export PS4='+[${BASH_SOURCE}] : ${LINENO} : ${FUNCNAME[0]:+${FUNCNAME[0]}() $ }'
           fi
         fi
       ;;
 
       --proxy)
@@ -665,11 +667,11 @@
     gemdir|gemhome|gempath)
       "$rvm_path/scripts/gemsets" "$rvm_action"
     ;;
 
     ruby|gem|rake|exec)
-      old_rvm_ruby_string=$rvm_ruby_string
+      old_rvm_ruby_string=${rvm_ruby_string:-""}
       unset rvm_ruby_string
       export rvm_ruby_strings
 
       "$rvm_path/scripts/set" "$rvm_action" $rvm_ruby_args ; result=$?
 
@@ -755,11 +757,17 @@
   fi
 
   __rvm_teardown
 
   if [[ ${rvm_trace_flag:-0} -eq 1 ]] ; then
-    set +x
     rvm_trace_flag=0
+    set +o verbose
+    set +o noclobber
+    set +o nounset
+
+    if [[ -z "${ZSH_VERSION:-""}" ]] ; then
+      set +o errtrace
+    fi
   fi
 
   return ${result:-0}
 }