Merge branch 'hotfix/1.26.3' into stable

Author: mpapis

VERSION

@@ -1 +1 @@
-1.26.2
+1.26.3

bin/rvm-prompt

@@ -25,7 +25,7 @@ add_raw_token()
 
 rvm_gemset_separator="${rvm_gemset_separator:-"@"}"
 if
-  [[ "${GEM_HOME:-}" =~ rvm && "$ruby_string" != "$rvm_path/bin/ruby" ]]
+  [[ "${GEM_HOME:-}" == *rvm* && "$ruby_string" != "$rvm_path/bin/ruby" ]]
 then
   unset format
   while

bin/rvm-shell

@@ -50,7 +50,7 @@ then
   rvm_shell_ruby_string="$1"
   shift
 elif
-  [[ "$1" == "--path" ]] && [[ -d "$2" || "$2" =~ /* ]]
+  [[ "$1" == "--path" ]] && [[ -d "$2" || "$2" == "/"* ]]
 then
   if
     [[ -d "$2" ]]

binscripts/rvm-installer

@@ -81,7 +81,7 @@ rvm_install_commands_setup()
     fail "Could not find GNU compatible version of 'tar' command, make sure it's available first before continuing installation."
   fi
   if
-    [[ ! " ${rvm_tar_options:-} " =~ " --no-same-owner "  ]] &&
+    [[ " ${rvm_tar_options:-} " != *" --no-same-owner "*  ]] &&
     $rvm_tar_command --help 2>&1 | GREP_OPTIONS="" \grep -- --no-same-owner >/dev/null
   then
     rvm_tar_options="${rvm_tar_options:-}${rvm_tar_options:+ }--no-same-owner"
@@ -180,10 +180,10 @@ __rvm_curl_output_control()
   then
     __flags+=( "--silent" "--show-error" )
   elif
-    [[ " $*" =~ " -s" || " $*" =~ " --silent" ]]
+    [[ " $*" == *" -s"* || " $*" == *" --silent"* ]]
   then
     # make sure --show-error is used with --silent
-    [[ " $*" =~ " -S" || " $*" =~ " -sS" || " $*" =~ " --show-error" ]] ||
+    [[ " $*" == *" -S"* || " $*" == *" -sS"* || " $*" == *" --show-error"* ]] ||
     {
       __flags+=( "--show-error" )
     }
@@ -481,7 +481,7 @@ rvm_install_default_settings()
 {
   # Tracing, if asked for.
   if
-    [[ "$*" =~ --trace ]] || (( ${rvm_trace_flag:-0} > 0 ))
+    [[ "$*" == *--trace* ]] || (( ${rvm_trace_flag:-0} > 0 ))
   then
     set -o xtrace
     rvm_trace_flag=1
@@ -772,7 +772,7 @@ follow this link for details how to fix:
     ;;
   esac
 
-  if [[ "$rvm_path" != /* ]]
+  if [[ "$rvm_path" != "/"* ]]
   then fail "The rvm install path must be fully qualified. Tried $rvm_path"
   fi
 }
@@ -860,7 +860,7 @@ rvm_install_ruby_and_gems()
 "
 
     if
-      [[ "${install_gems[*]}" =~ "rails" ]]
+      [[ "${install_gems[*]}" == *"rails"* ]]
     then
       printf "%b" "
   * To start using rails you need to run \`rails new <project_dir>\`.

binscripts/rvm-installer.asc

@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAABAgAGBQJUXmL3AAoJEOIGwp+/BP8XZYAQAIFDRTMUww09VHS1rhbq9hHU
-TDunUCrxMXsnNOmT4LMW+aTx8X3uXQDvj4HNd5rqTJaO9VvTAnDqYFwegGPTwQKP
-4RR8SmyAROqw64A219kYtuaqxQgNeOvVBCtXsSGylsJlh5/RC7QXjjoPdECckSA8
-KnkJp0AQZYJrruHbjFqiQh6hmpmnWCox762VxwsiAXms/8XU+UGkA+WJPfslrPkS
-OXGnJOsfX6MA6sRV0258hwEq4nh44Tp3zkL7D2b/YEoUvmEzQ9lqqtFnBGaatn1a
-ktyeRaLaZCjqhvYaajgWvamD3/yxdlKcvISJIchwzqxX3GoTKxuAjrdfnXHUGI6A
-QF/wadnWDZ7eNStOYRr7mkIB9l8Y7KllMZRYM36q5cGvjS3ec7x+9fGERMCsZLDw
-O7GjwGz14RICfjCCbtLK8BOvBW53k7kHBsmY+WT+A/4C9cM0KSUvwTP20dH2Cg5m
-cbDph7MaK6ecdCK72Ref+JZzT2rV230L5a4KSehir2Yd+dI3drGRE2yVD0nL0Dhn
-g+RgTHXyK2ZmRDt2i6IcxHKzv1nCEjO76nTg3+SqBtvxsey9r0y/g1p4Xn/X7lkT
-zoLAMO9LMqWZ33ZeOKA1rPG1PYxusR5jmIQaY8159ZHEzuTVA5hbygi5HfRVZyew
-GtUxTqrMsFcbyz2v2663
-=TAQ2
+iQIcBAABAgAGBQJUaO5wAAoJEOIGwp+/BP8XxOsP/A6wPtJ5dxvjujOc03geRv+g
+5MnPR5gQqHS2uEJI0jACy8sghPYJIVfCNu03GTwmyBVA8RqDUtdIqy4RmcJX3uLh
+rp1LlyJv74UjmyZGzSFLcM/8ivwdGdZaR/oBHOf0kA44gPUO1xXWeSvH/xp2oPi3
++Lhxn+vGD26FY5ZhammLxVuHrcnMGNa6UCxZFdFI2STrzE+ilP3LbWGLkc4DYjCG
+Zg9b4BvZT8EXo7v31hDyaYGj/JhXBeOWZB48Djs2q7gdvXUPH4WIv/QuKB6h0n2k
+qrdnCGlRQLSPC1nRORmIDvY4ceAkfOqwp9dzp91xC/YAbQx34QraqhzdHPI2sBPx
+R7nUX78tmgq3VgmxDRDRItGZlp2qM75QZEDsTkv2bb7Zim3uwoLhR9e3p5pMxzt1
+qmqRynlDd2fh9CSM/TTVyZwnHXS9vjNNyG2CZoHlrQp65WDVkKAHyvqYn97h0N1V
+sycJtYBqIvVtNA5UdQqlczpXKxHn7aYTkUh8/oeGFyNr3RXVE4eNB/kLWnZivULj
+vpSB5L8mO8mHB5i0QPmNMoezsHXz9NrBfjSRK651BmqPhAN99nzsFghktjf5Qgs2
+cgJQrRULfDbH8RJT/g9hdmRe5oMEo5TwZKEtiI0A31L6kzaBW2O0GdfAaP8QbKIM
+y/PGGyFt2JdmNCQcq3XG
+=kGgR
 -----END PGP SIGNATURE-----

help/gemset/copy.md

@@ -0,0 +1,9 @@
+
+## Usage
+
+    rvm gemset copy ruby-from[@gemset] ruby-to[@gemset]
+
+
+## Description
+
+Copy the `ruby-from` `gemset`s gems (`default` if omitted) to the `ruby-to` `gemset`.

rvm-test-rvm1/exports_comment_test.sh

@@ -0,0 +1,9 @@
+source "$rvm_path/scripts/rvm"
+
+export TEST_VAR=2     # env[TEST_VAR]=/^2$/; env[rvm_old_TEST_VAR]=/^$/
+rvm export TEST_VAR=3 # env[TEST_VAR]=/^3$/; env[rvm_old_TEST_VAR]=/^2$/
+rvm unexport          # env[TEST_VAR]=/^2$/; env[rvm_old_TEST_VAR]=/^$/
+
+unset TEST_VAR        # env[TEST_VAR]=/^$/
+rvm export TEST_VAR=3 # env[TEST_VAR]=/^3$/
+rvm unexport          # env[TEST_VAR]=/^$/

scripts/base

@@ -5,12 +5,20 @@
 #duplicated from scripts/rvm - rare reload issue
 __rvm_has_opt()
 {
-  # pre-gnu
-  if [[ -n "${ZSH_VERSION}"  ]] && setopt | GREP_OPTIONS="" \command \grep "^${1}$" >/dev/null 2>&1
-  then return 0
-  elif [[ -n "${BASH_VERSION}" ]] && [[ ":$SHELLOPTS:" =~ ":${1}:" ]]
-  then return 0
-  else return 1
+  if # pre-gnu
+   [[ -n "${ZSH_VERSION}"  ]]
+  then
+    setopt | GREP_OPTIONS="" \command \grep "^${1}$" >/dev/null 2>&1 || return $?
+  elif # mksh
+    [[ -n "${KSH_VERSION}"  ]]
+  then
+    set +o | GREP_OPTIONS="" \command \grep "-o ${1}$" >/dev/null 2>&1 || return $?
+  elif # bash
+    [[ -n "${BASH_VERSION}" ]]
+  then
+    [[ ":$SHELLOPTS:" == *":${1}:"* ]] || return $?
+  else # what is this?!
+    return 1
   fi
 }
 

scripts/cd

@@ -35,7 +35,6 @@ case "${rvm_project_rvmrc:-1}" in
     __rvm_do_with_env_after
     return 0
   }
-  export -a chpwd_functions
   [[ " ${chpwd_functions[*]} " == *" __rvm_cd_functions_set "* ]] ||
   chpwd_functions=( "${chpwd_functions[@]}" __rvm_cd_functions_set )
 

scripts/cli

@@ -31,7 +31,6 @@ __rvm_parse_args_find_known_flags()
         rvm_disable_binary_flag=1
         ;;
       (--patches|--patch)
-        export -a rvm_patch_names
         __rvm_custom_separated_array rvm_patch_names , "${2:-}"
         rvm_patch_original_pwd="$PWD"
         rvm_disable_binary_flag=1
@@ -77,7 +76,7 @@ __rvm_parse_args()
   rvm_parse_break=0
 
   if
-    [[ " $* " =~ " --trace " ]]
+    [[ " $* " == *" --trace "* ]]
   then
     echo "$@"
     __rvm_version
@@ -236,9 +235,9 @@ __rvm_parse_args()
               [[ -n "${next_token:-}" ]] &&
               [[ -x "${next_token:-}" ||
                 -d "${next_token:-}" ||
-                "${next_token:-}" =~ ^http ||
-                "${next_token:-}" =~ tar.bz2$ ||
-                "${next_token:-}" =~ tar.gz$
+                "${next_token:-}" == http* ||
+                "${next_token:-}" == *tar.bz2 ||
+                "${next_token:-}" == *tar.gz
               ]]
             do
               rvm_ruby_args=("$next_token" "${rvm_ruby_args[@]}")
@@ -286,7 +285,9 @@ __rvm_parse_args()
             if
               [[ -n "$next_token" ]]
             then
-              rvm_export_args="$next_token$@"
+              typeset -a ___args
+              ___args=( "$next_token" "$@" )
+              rvm_export_args="${___args[*]}"
               rvm_action="export"
               rvm_parse_break=1
             else
@@ -482,10 +483,10 @@ __rvm_parse_args()
             fi
             while
               [[ -n "${next_token:-}" ]] &&
-              [[ "${next_token:-}" =~ ^http ||
-                "${next_token:-}" =~ tar.bz2$ ||
-                "${next_token:-}" =~ tar.gz$ ||
-                "${next_token:-}" =~ ":"
+              [[ "${next_token:-}" == http* ||
+                "${next_token:-}" == *tar.bz2 ||
+                "${next_token:-}" == *tar.gz ||
+                "${next_token:-}" == *":"*
               ]]
             do
               rvm_ruby_args=("${rvm_ruby_args[@]}" "$next_token")
@@ -508,7 +509,6 @@ __rvm_parse_args()
             ;;
 
           --patches|--patch)
-            export -a rvm_patch_names
             __rvm_custom_separated_array rvm_patch_names , "$next_token"
             next_token="${1:-}"
             (( $# == 0 )) || shift
@@ -815,7 +815,6 @@ __rvm_parse_args()
 rvm()
 {
   typeset result current_result
-  export -a rvm_ruby_args >/dev/null 2>/dev/null
   rvm_ruby_args=()
 
   __rvm_teardown_if_broken
@@ -971,7 +970,7 @@ rvm()
           fi
           unset gem_prefix
         elif
-          [[ "${rvm_ruby_args[*]}" =~ ^rename ]]
+          [[ "${rvm_ruby_args[*]}" == rename* ]]
         then
           typeset _command _from _to
           read _command _from _to <<<"${rvm_ruby_args[*]}"