Let us be more direct, shall we?

binscripts/rvmsudo

@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 
 prefix="PATH='$PATH'"
-if [[ -n "${BUNDLE_PATH+x}" ]] ; then prefix="BUNDLE_PATH='$BUNDLE_PATH' $prefix" ; fi
-if [[ -n "${GEM_HOME+x}" ]]    ; then prefix="GEM_HOME='$GEM_HOME' $prefix" ; fi
-if [[ -n "${GEM_PATH+x}" ]]    ; then prefix="GEM_PATH='$GEM_PATH' $prefix" ; fi
+if [[ -n "${BUNDLE_PATH:-""}" ]] ; then prefix="BUNDLE_PATH='$BUNDLE_PATH' $prefix" ; fi
+if [[ -n "${GEM_HOME:-""}" ]]    ; then prefix="GEM_HOME='$GEM_HOME' $prefix" ; fi
+if [[ -n "${GEM_PATH:-""}" ]]    ; then prefix="GEM_PATH='$GEM_PATH' $prefix" ; fi
 
 eval "sudo" "/usr/bin/env $prefix $@"
 # rvm_env_prefix="PATH='$PATH'"

scripts/array

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-if [[ -n "${ZSH_VERSION+x}" ]] ; then __array_start=1 ; else __array_start=0 ; fi
+if [[ -n "${ZSH_VERSION:-""}" ]] ; then __array_start=1 ; else __array_start=0 ; fi
 
 # Usage: contains "a_string" "${an_array[@]}"
 array_contains() {

scripts/cd

@@ -4,7 +4,7 @@
 # To disable this fature, set rvm_project_rvmrc=0 in $HOME/.rvmrc
 rvm_project_rvmrc=${rvm_project_rvmrc:-1}
 if [[ $rvm_project_rvmrc -ne 0 ]] ; then
-  if [[ -n "${ZSH_VERSION+x}" ]] ; then
+  if [[ -n "${ZSH_VERSION:-""}" ]] ; then
     autoload is-at-least
     if is-at-least 4.3.4 >/dev/null 2>&1; then
       # On zsh, use chpwd_functions

scripts/cli

@@ -322,7 +322,7 @@ __rvm_parse_args() {
       --install)            rvm_install_on_use_flag=1            ;;
       --trace)
           rvm_trace_flag=1
-          if [[ -z "${ZSH_VERSION+x}" ]] ; then
+          if [[ -z "${ZSH_VERSION:-""}" ]] ; then
             local option="" ;
             for option in verbose xtrace errexit errtrace noclobber nounset pipefail ; do
               set -o $option
@@ -494,7 +494,7 @@ rvm() {
                *) rvm_interactive_flag=0 ;;
   esac ; export rvm_interactive_flag
 
-  if [[ -z "${ZSH_VERSION+x}" ]] ; then
+  if [[ -z "${ZSH_VERSION:-""}" ]] ; then
     trap '\rm -rf "$rvm_tmp_path/$$" >/dev/null 2>&1' 0 1 2 3 15
   fi
 

scripts/env

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+if [[ "$rvm_trace_flag" -eq 2 ]] ; then set -x ; export rvm_trace_flag ; fi
+
 # Recursive loops, oh my!
 unset rvm_default_flag
 

scripts/hash

@@ -9,9 +9,9 @@
 # we then provide functionality of a file based hash
 #
 
-if [[ -z "$rvm_trace_flag" ]] ; then set +x ; else set -x ; fi
+if [[ "$rvm_trace_flag" -eq 2 ]] ; then set -x ; export rvm_trace_flag ; fi
 
-if [[ -n "${ZSH_VERSION+x}" ]] ; then __array_start=1 ; else __array_start=0 ; fi
+if [[ -n "${ZSH_VERSION:-""}" ]] ; then __array_start=1 ; else __array_start=0 ; fi
 
 hash() {
   hash_name=$1 ; hash_key=$2 ; hash_value=$3
@@ -32,6 +32,5 @@ hash() {
     eval "_hash_${hash_name}_keys[$index]=\"$hash_key\""
     eval "_hash_${hash_name}_values[$index]=\"$hash_value\""
   fi
-  set +x
 }
 

scripts/info

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+if [[ "$rvm_trace_flag" -eq 2 ]] ; then set -x ; export rvm_trace_flag ; fi
+
 source "$rvm_scripts_path/base"
 source "$rvm_scripts_path/version"
 

scripts/maglev

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; fi
+if [[ "$rvm_trace_flag" -eq 2 ]] ; then set -x ; export rvm_trace_flag ; fi
 
 system="$(uname -s)"
 if [[ $system = "SunOS" ]] && [[ "$(uname -m)" = "i86pc" ]] ; then system="Solaris-x86" ; fi

scripts/manage

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+if [[ "$rvm_trace_flag" -eq 2 ]] ; then set -x ; export rvm_trace_flag ; fi
+
 original_ruby_version=$rvm_ruby_version
 original_ruby_string=$rvm_ruby_string
 

scripts/md5

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-if [[ "$rvm_trace_flag" -eq 1 ]] ; then set -x ; export rvm_trace_flag ; fi
+if [[ "$rvm_trace_flag" -eq 2 ]] ; then set -x ; export rvm_trace_flag ; fi
 
 args=($*)
 file="${args[0]}"

scripts/package

@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+
+if [[ "$rvm_trace_flag" -eq 2 ]] ; then set -x ; export rvm_trace_flag ; fi
+
 rvm_base_except="selector"
 source "$rvm_scripts_path/base"
 

scripts/selector

@@ -551,7 +551,7 @@ __rvm_gemset_select() {
     # No longer defaulting to 'sticky' gem sets.
     # Set 'rvm_sticky_flag=1' in ~/.rvmrc to enable.
     if [[ $rvm_sticky_flag -eq 1 ]] ; then
-      if [[ -n "${GEM_HOME+x}" ]] ; then
+      if [[ -n "${GEM_HOME:-""}" ]] ; then
         rvm_gemset_name=$(echo $GEM_HOME | xargs basename | awk -F${rvm_gemset_separator} '{print $2}')
       fi
 
@@ -565,9 +565,9 @@ __rvm_gemset_select() {
     else
       if [[ -n "$rvm_ruby_string" ]] && [[ "$rvm_ruby_interpreter" != "system" ]] ; then
         rvm_ruby_gem_home="$rvm_gems_path/$rvm_ruby_string"
-      elif [[ -z "${GEM_HOME+x}" ]]  && [[ -n "$(command -v gem)" ]] ; then
+      elif [[ -z "${GEM_HOME:-""}" ]]  && [[ -n "$(command -v gem)" ]] ; then
         rvm_ruby_gem_home=$(gem env gemdir)
-      elif [[ -n "${GEM_HOME+x}" ]] ; then
+      elif [[ -n "${GEM_HOME:-""}" ]] ; then
         rvm_ruby_gem_home="$GEM_HOME"
       else
         rvm_ruby_gem_home=""

scripts/set

@@ -100,7 +100,7 @@ __rvm_summary() {
     summary="$summary \033[0;31m${#errors[*]} errors: $(echo "${errors[*]}" | sed 's# #, #g')\033[0m\n"
   fi
   total=${#rubies[*]}
-  if [[ -n "${ZSH_VERSION+x}" ]] ; then array_start=1 ; else array_start=0 ; fi
+  if [[ -n "${ZSH_VERSION:-""}" ]] ; then array_start=1 ; else array_start=0 ; fi
 
   printf "$summary" | tee -a log/summary.log
   return ${#errors[*]}
@@ -115,7 +115,7 @@ __rvm_yaml() {
   for var in ${errors[*]} ; do yaml="$yaml\n  - $var" ; done
   yaml="$yaml\nrubies:"
   total=${#rubies[*]}
-  if [[ -n "${ZSH_VERSION+x}" ]] ; then array_start=1 ; else array_start=0 ; fi
+  if [[ -n "${ZSH_VERSION:-""}" ]] ; then array_start=1 ; else array_start=0 ; fi
   for (( index = $array_start ; index < $total + $array_start ; index++ )) ; do
     if [[ ! -z "$rvm_debug_flag" ]] ; then
       "$rvm_scripts_path/log" "debug" "${rubies[$index]}: ${statuses[$index]}"
@@ -137,7 +137,7 @@ __rvm_json() {
   json="$json\n  \"rubies\": {"
 
   total=${#rubies[*]}
-  if [[ -n "${ZSH_VERSION+x}" ]] ; then array_start=1 ; else array_start=0 ; fi
+  if [[ -n "${ZSH_VERSION:-""}" ]] ; then array_start=1 ; else array_start=0 ; fi
 
   for (( index = $array_start ; index < $total + $array_start ; index++ )) ; do
     if [[ ! -z "$rvm_debug_flag" ]] ; then

scripts/utility

@@ -2,7 +2,7 @@
 
 __rvm_setup() {
   # ZSH has 1 based array indexing, bash has 0 based.
-  if [[ -n "${ZSH_VERSION+x}" ]] ; then
+  if [[ -n "${ZSH_VERSION:-""}" ]] ; then
     __shell_array_start=1
     # Set clobber for zsh users, for compatibility with bash's append operator ( >> file ) behavior
     setopt | \grep -qs '^noclobber$'
@@ -18,7 +18,7 @@ __rvm_teardown() {
   declare rvm_clang_flag=${rvm_clang_flag:-0}
   declare rvm_prior_cc=${rvm_prior_cc:-""}
 
-  if [[ -n "${ZSH_VERSION+x}" ]] ; then
+  if [[ -n "${ZSH_VERSION:-""}" ]] ; then
     if [[ "$rvm_zsh_clobber" -eq 0 ]] ; then
       setopt noclobber
     fi ; unset rvm_zsh_clobber
@@ -85,8 +85,8 @@ __rvm_ruby_string_paths_under() {
 __rvm_db() {
   local value="" key="" variable=""
 
-  key=${1+x}
-  variable=${2+x}
+  key=${1:-""}
+  variable=${2:-""}
 
   if [[ -f "$rvm_config_path/user" ]] ; then
     value="$($rvm_scripts_path/db "$rvm_config_path/user" "$key")"
@@ -97,7 +97,7 @@ __rvm_db() {
   fi
 
   if [[ -n "$value" ]] ; then
-    if [[ -z $variable ]] ; then
+    if [[ -z "$variable" ]] ; then
       echo $value
     else
       eval "$variable='$value'"

test/btu

@@ -8,7 +8,7 @@
 # Public Methods
 #
 
-if [[ -n "${ZSH_VERSION+x}" ]] ; then __array_start=1 ; else __array_start=0 ; fi
+if [[ -n "${ZSH_VERSION:-""}" ]] ; then __array_start=1 ; else __array_start=0 ; fi
 
 btu_push() {
   array=$1 ; shift ; item=$2