rvm 1.0.11 → 1.0.13

data/scripts/selector

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
 # __rvm_select implementation version patch_level
-__rvm_select() {
-
+__rvm_select()
+{
   # Set Variable Defaults
   export GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION
 
@@ -233,7 +233,7 @@ __rvm_select() {
 
     rvm_ruby_gem_home="${rvm_gems_path:-"$rvm_path/gems"}/${rvm_ruby_string}"
 
-    if [[ ! -z "$rvm_gemset_name" ]] ; then
+    if [[ -n "$rvm_gemset_name" ]] ; then
       rvm_ruby_gem_home="${rvm_ruby_gem_home}${rvm_gemset_separator:-"@"}${rvm_gemset_name}"
       rvm_ruby_gem_path="${rvm_ruby_gem_home}:${rvm_gems_path:-"$rvm_path/gems"}/${rvm_ruby_string}${rvm_gemset_separator:-"@"}global"
     fi
@@ -254,7 +254,8 @@ __rvm_select() {
   fi
 }
 
-__rvm_use() {
+__rvm_use()
+{
   local new_path binary full_binary_path rvm_ruby_gem_home
 
   #if [[ ${rvm_ruby_selected_flag:-0} -eq 0 ]] ; then __rvm_select "$@" ; fi
@@ -266,7 +267,7 @@ __rvm_use() {
 
     unset GEM_HOME GEM_PATH BUNDLE_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
 
-    new_path="${rvm_bin_path:-"$rvm_path/bin"}:$(__rvm_remove_rvm_from_path ; printf "$PATH")"
+    new_path="$(__rvm_remove_rvm_from_path ; printf "$PATH"):${rvm_bin_path:-"$rvm_path/bin"}"
 
     if [[ -s $rvm_path/config/system ]] ; then
 
@@ -338,9 +339,13 @@ __rvm_use() {
   fi
 
   # Export ruby string and gem set me for extrenal scripts to take advantage of them.
-  if [[ -n "${rvm_ruby_string:-""}" ]]  ; then export rvm_ruby_string  ; fi
+  if [[ -n "${rvm_ruby_string:-""}" ]]  ; then
+    export rvm_ruby_string
+  fi
 
-  if [[ -n "${rvm_gemset_name:-""}" ]]  ; then export rvm_gemset_name ; fi
+  if [[ -n "${rvm_gemset_name:-""}" ]]  ; then
+    export rvm_gemset_name
+  fi
 
   if [[ -n "$new_path" ]]; then
     export PATH="$new_path"
@@ -409,7 +414,8 @@ __rvm_use() {
   return 0
 }
 
-__rvm_ruby_string() {
+__rvm_ruby_string()
+{
   # rvm_ruby_string may designate any of the following items:
   # * rvm_gemset_name
   # * rvm_ruby_interpreter
@@ -437,7 +443,7 @@ __rvm_ruby_string() {
       rvm_ruby_string="system"
     fi
   fi
-  
+
   if echo "$rvm_ruby_string" | \grep -q "${rvm_gemset_separator:-"@"}" ; then
     rvm_gemset_name="${rvm_ruby_string/*${rvm_gemset_separator:-"@"}/}"
     rvm_ruby_string="${rvm_ruby_string/${rvm_gemset_separator:-"@"}*/}"
@@ -648,14 +654,13 @@ __rvm_ruby_string() {
 
 # Select a gemset based on CLI set options and environment.
 # This only sets 'rvm_ruby_gem_home'
-__rvm_gemset_select() {
-
+__rvm_gemset_select()
+{
   command -v gem > /dev/null
   if [[ $? -gt 0 ]] ; then return 0 ; fi # Stop if no 'gem' command is available.
 
   rvm_ruby_gem_home=${rvm_ruby_gem_home:-""}
   rvm_gemset_name=${rvm_gemset_name:-""}
-  rvm_ruby_global_gems_path="${rvm_ruby_gem_home%%${rvm_gemset_separator:-"@"}*}${rvm_gemset_separator:-"@"}global"
 
   if [[ -z "${rvm_gemset_name:-""}" ]] ; then
 
@@ -672,7 +677,8 @@ __rvm_gemset_select() {
       fi
     fi
 
-    if ! echo "${rvm_gemset_name:-""}" | grep -q "^[[:digit:]]\.[[:digit:]]" ; then
+    if [[ -n "${rvm_gemset_name:-""}" ]] &&
+      ! echo "${rvm_gemset_name:-""}" | grep -q "^[[:digit:]]\.[[:digit:]]" ; then
 
       rvm_ruby_gem_home="${rvm_gems_path:-"$rvm_path/gems"}/${rvm_ruby_string}${rvm_gemset_separator:-"@"}${rvm_gemset_name}"
 
@@ -729,9 +735,9 @@ __rvm_gemset_select() {
 
   if [[ -z "${rvm_ruby_gem_home:-""}" && -n "${rvm_ruby_string:-""}" ]] ; then
     rvm_ruby_gem_home="${rvm_gems_path:-"$rvm_path/gems"}/$rvm_ruby_string"
-    rvm_ruby_global_gems_path="${rvm_ruby_gem_home%%${rvm_gemset_separator}*}${rvm_gemset_separator:-"@"}global"
   fi
 
+  rvm_ruby_global_gems_path="${rvm_ruby_gem_home%%${rvm_gemset_separator:-"@"}*}${rvm_gemset_separator:-"@"}global"
   rvm_ruby_gem_path="$rvm_ruby_gem_home:$rvm_ruby_global_gems_path"
 
   # Ensure that the ruby gem home exists.
@@ -748,9 +754,11 @@ __rvm_gemset_select() {
 }
 
 # Use a gemset specified by 'rvm_ruby_gem_home'
-__rvm_gemset_use() {
+__rvm_gemset_use()
+{
   if [[ -z "${rvm_gemset_name:-""}" ]] ; then
-    "$rvm_path/scripts/log" "error" "Gemset was not given.\n  Usage:\n    rvm gemset use <gemsetname>\n"
+    "$rvm_path/scripts/log" "error" \
+      "Gemset was not given.\n  Usage:\n    rvm gemset use <gemsetname>\n"
     return 1
   fi
 
@@ -758,10 +766,12 @@ __rvm_gemset_use() {
 
     if [[ ! -d "$rvm_ruby_gem_home" ]] ; then
 
-      if [[ ${rvm_gemset_create_on_use_flag:-0} -eq 1 || ${rvm_create_flag:-0} -eq 1 ]] ; then
+      if [[ ${rvm_gemset_create_on_use_flag:-0} -eq 1 \
+        || ${rvm_create_flag:-0} -eq 1 ]] ; then
         "$rvm_path/scripts/gemsets" create "$rvm_gemset_name"
       else
-        "$rvm_path/scripts/log" "error" "Gemset '$rvm_gemset_name' does not exist, rvm gemset create '$rvm_gemset_name' first."
+        "$rvm_path/scripts/log" "error" \
+          "Gemset '$rvm_gemset_name' does not exist, rvm gemset create '$rvm_gemset_name' first."
         return 1
       fi
     fi
@@ -771,9 +781,12 @@ __rvm_gemset_use() {
     fi
 
     rvm_ruby_gem_home="${GEM_HOME//${rvm_gemset_separator:-"@"}*}${rvm_gemset_separator:-"@"}${rvm_gemset_name}"
+    rvm_ruby_global_gems_path="${rvm_ruby_gem_home%%${rvm_gemset_separator:-"@"}*}${rvm_gemset_separator:-"@"}global"
+
     GEM_HOME="$rvm_ruby_gem_home"
     BUNDLE_PATH="$rvm_ruby_gem_home"
     GEM_PATH="$rvm_ruby_gem_home:$rvm_ruby_global_gems_path"
+
     export rvm_ruby_gem_home GEM_HOME BUNDLE_PATH GEM_PATH
 
     __rvm_use # Now ensure the selection takes effect for the environment.
@@ -782,14 +795,23 @@ __rvm_gemset_use() {
   return 0
 }
 
-__rvm_gemset_clear() {
-  rvm_gemset_name="" ; shift # TODO: Is this shift necessary???
+__rvm_gemset_clear()
+{
+  rvm_gemset_name=""
+
   rvm_ruby_gem_home="${GEM_HOME//${rvm_gemset_separator:-"@"}*}"
-  rvm_ruby_global_gems_path="${rvm_ruby_gem_home%%${rvm_gemset_separator:-"@"}*}${rvm_gemset_separator:-"@"}global"
+
+  rvm_ruby_global_gems_path="${rvm_ruby_gem_home}${rvm_gemset_separator:-"@"}global"
+
   GEM_HOME=$rvm_ruby_gem_home
+
   BUNDLE_PATH="$rvm_ruby_gem_home"
+
   GEM_PATH="$rvm_ruby_gem_home:$rvm_ruby_global_gems_path"
+
   export rvm_ruby_gem_home rvm_ruby_global_gems_path GEM_HOME BUNDLE_PATH GEM_PATH
+
   __rvm_use # Now ensure the selection takes effect for the environment.
+
 }
 

data/scripts/set

@@ -2,7 +2,8 @@
 
 source "$rvm_path/scripts/base"
 
-__rvm_attempt_single_exec() {
+__rvm_attempt_single_exec()
+{
   # Return if we have multiple rubies. or we're not running exec.
   if [[ "$action" = "exec" && ${#rvm_ruby_strings[@]} -lt 2 ]]; then
 
@@ -15,8 +16,8 @@ __rvm_attempt_single_exec() {
 }
 
 # Perform an action using one of a selected ruby's specified binaries.
-__rvm_ruby_do() {
-
+__rvm_ruby_do()
+{
   # Return on invalid rubies.
   __rvm_become "$current_set_ruby" || return 1
 
@@ -144,7 +145,8 @@ __rvm_ruby_do() {
 }
 
 # Output the summary in a human readable format.
-__rvm_summary() {
+__rvm_summary()
+{
   export successes errors statuses
 
   summary="\nSummary:\n\n"
@@ -172,8 +174,8 @@ __rvm_summary() {
 }
 
 # Output the summary in a yaml format.
-__rvm_yaml() {
-
+__rvm_yaml()
+{
   export successes errors statuses
 
   yaml="totals:\n  rubies: ${#rubies[*]}\n  successes: ${#successes[*]}\n  errors: ${#errors[*]}\nsuccesses:"
@@ -210,8 +212,8 @@ __rvm_yaml() {
 }
 
 # Output the summary in a json format.
-__rvm_json() {
-
+__rvm_json()
+{
   local index array_start
 
   json="{

data/scripts/snapshot

@@ -5,7 +5,8 @@ unset GREP_OPTIONS
 
 source "$rvm_path/scripts/base"
 
-__error_on_result() {
+__error_on_result()
+{
   if [[ "$1" -gt 0 ]]; then
     "$rvm_path/scripts/log" "fail" "$2 - Aborting now."
     return 0
@@ -14,8 +15,8 @@ __error_on_result() {
   fi
 }
 
-snapshot_save() {
-
+snapshot_save()
+{
   if [[ -z "$1" ]]; then
 
     printf "
@@ -138,7 +139,10 @@ snapshot_save() {
   "$rvm_path/scripts/log" "info" "Snapshot complete"
 }
 
-snapshot_load() {
+snapshot_load()
+{
+  local package_info
+
   if [[ -z "$1" ]]; then
     echo "Usage: rvm snapshot load name" >&2
     echo "Loads a snapshot from <name>.tar.gz in the current directory." >&2
@@ -176,13 +180,18 @@ snapshot_load() {
   done; unset snapshot_package
 
   "$rvm_path/scripts/log" "info" "Installing rubies"
+
   chmod +x "$snapshot_temp_path/install-rubies.sh"
+
   "$snapshot_temp_path/install-rubies.sh"
   result="$?"
+
   __error_on_result "$result" "Error importing rubies." && return "$result"
 
   export rvm_create_flag=1
+
   "$rvm_path/scripts/log" "info" "Setting up gemsets"
+
   (
     builtin cd "$snapshot_temp_path/gems"
 
@@ -213,6 +222,7 @@ snapshot_load() {
   )
 
   "$rvm_path/scripts/log" "info" "Restoring aliases"
+
   while read -r package_info; do
     # Note: this assumes an '=' int the input...
     local alias_name="${package_info/=*}"
@@ -225,7 +235,6 @@ snapshot_load() {
       __error_on_result "$result" "Error setting default to $alias_ruby" && return "$result"
     fi
   done < "$snapshot_temp_path/alias"
-  unset package_info
 
   "$rvm_path/scripts/log" "info" "Cleaning up load process"
   \rm -rf "$snapshot_temp_path"
@@ -233,7 +242,8 @@ snapshot_load() {
   "$rvm_path/scripts/log" "info" "Loaded snapshot from $(basename "$snapshot_archive")"
 }
 
-snapshot_usage() {
+snapshot_usage()
+{
   echo "Usage: rvm snapshot {save,load} file" >&2
   return 1
 }

data/scripts/tools

@@ -2,17 +2,20 @@
 
 source "$rvm_path/scripts/base"
 
-usage() {
+usage()
+{
   echo "Usage: rvm tools {identifier,path-identifier,strings}" 1>&2
   exit 1
 }
 
 # Return the identifier that's current in use.
-tools_identifier() {
+tools_identifier()
+{
   __rvm_environment_identifier
 }
 
-tools_path_identifier() {
+tools_path_identifier()
+{
   if [[ -z "$1" || ! -d "$1" ]]; then
     echo "Usage: rvm tools path-identifier 'path-to-check'"
     return 1
@@ -26,7 +29,8 @@ tools_path_identifier() {
   exit $rvmrc_result
 }
 
-tools_strings() {
+tools_strings()
+{
   for ruby_name in "$@"; do
     __rvm_unset_ruby_variables
     rvm_ruby_string="$ruby_name"

data/scripts/update

@@ -1,10 +1,13 @@
 #!/usr/bin/env bash
 
 set -o errtrace
+set -o errexit
+
 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 [[ "root" = "$(whoami)" \
+    || -n "$rvm_prefix" && "$rvm_prefix" != "$HOME"/* ]]; then
     export rvm_selfcontained=0
   else
     export rvm_selfcontained=1
@@ -15,34 +18,49 @@ unset rvm_auto_flag
 
 install_source_path="$(dirname "$0" | sed 's#\/scripts$##')"
 
-if [[ -d "$install_source_path/scripts" ]] && [[ -s "$install_source_path/scripts/utility" ]] ; then
+if [[ -d "$install_source_path/scripts" \
+  && -s "$install_source_path/scripts/utility" ]] ; then
   builtin cd "$install_source_path"
 fi
 
 source scripts/version
 source scripts/utility
 
-usage() {
+usage()
+{
   printf "
   Usage:
+
     ${0} [options]
 
   options:
+
     --auto    : Automatically update shell profile files.
+
     --prefix  : Installation prefix directory.
+
     --help    : Display help/usage (this) message
+
     --version : display rvm package version
+
   "
 }
 
-check_rubyopt_conditions() {
+check_rubyopt_conditions()
+{
   if [[ -n "${RUBYOPT:-""}" ]]; then
-    printf "\n\nWARNING: You have RUBYOPT set in your current environment. This may interfere with normal rvm"
-    printf "\n operation. If errors show up, please try unsetting RUBYOPT first.\n"
+    printf "
+
+WARNING: You have RUBYOPT set in your current environment.
+This may cause rubies to not work as you expect them to as it is not supported
+by all of them If errors show up, please try unsetting RUBYOPT first.
+
+"
   fi
 }
 
-andand_return_instructions() {
+andand_return_instructions()
+{
   printf "
   This means that if you see something like:
 
@@ -63,7 +81,8 @@ EOF - This marks the end of the .bashrc file
 "
 }
 
-installation_complete() {
+installation_complete()
+{
   printf "
   You must now complete the install by loading RVM in new shells.
 
@@ -91,7 +110,8 @@ installation_complete() {
   \n"
 }
 
-andand_return_warning() {
+andand_return_warning()
+{
   printf "
   WARNING:  you have a 'return' statement in your ~/.bashrc
               This could cause some features of RVM to not work.
@@ -104,7 +124,8 @@ andand_return_warning() {
   \n"
 }
 
-thank_you() {
+thank_you()
+{
   printf "
 ${name:-"$(whoami)"},
 
@@ -135,7 +156,8 @@ or opening a new shell
 "
 }
 
-upgrade_notes() {
+upgrade_notes()
+{
   printf "
 
 Upgrade Notes
@@ -187,14 +209,23 @@ fi
 
 source scripts/initialize
 
-if grep -q 'scripts/rvm' "$HOME"/.bash* 2>/dev/null || grep -q 'scripts/rvm' "$HOME"/.zsh* 2>/dev/null; then
+if grep -q 'scripts/rvm' "$HOME"/.bash* 2>/dev/null \
+  || grep -q 'scripts/rvm' "$HOME"/.zsh* 2>/dev/null ; then
+
   if [[ -d "$rvm_path" ]] && [[ -s "${rvm_path}/scripts/rvm" ]] ; then
+
     export upgrade_flag=1
+
   else
+
     export upgrade_flag=0
+
   fi
+
 else
+
   export upgrade_flag=0
+
 fi
 
 __rvm_initialize
@@ -237,7 +268,17 @@ else
 
 fi
 
-directories=( "${rvm_archives_path:-"$rvm_path/archives"}" "${rvm_src_path:-"$rvm_path/src"}" "${rvm_log_path:-"$rvm_path/log"}" "$rvm_bin_path" "${rvm_gems_path:-"$rvm_path/gems"}" "${rvm_rubies_path:-"$rvm_path/rubies"}" "$rvm_path/config" "${rvm_tmp_path:-"$rvm_path/tmp"}" "$rvm_path/bin" )
+directories=(
+  "${rvm_archives_path:-"$rvm_path/archives"}"
+  "${rvm_src_path:-"$rvm_path/src"}"
+  "${rvm_log_path:-"$rvm_path/log"}"
+  "$rvm_bin_path"
+  "${rvm_gems_path:-"$rvm_path/gems"}"
+  "${rvm_rubies_path:-"$rvm_path/rubies"}"
+  "$rvm_path/config"
+  "${rvm_tmp_path:-"$rvm_path/tmp"}"
+  "$rvm_path/bin"
+  )
 
 for directory in "${directories[@]}" ; do
 
@@ -277,7 +318,8 @@ for dir_name in config scripts examples lib hooks help patches; do
 done
 
 if [[ ! -s "$rvm_path/config/user" ]] ; then
-  echo '# Users settings file, overrides db file settings and persists across installs.' >> "$rvm_path/config/user"
+  echo '# User settings, overrides db settings and persists across installs.' \
+    >> "$rvm_path/config/user"
 fi
 
 scripts=(monitor match log install color db fetch log set package)
@@ -321,9 +363,12 @@ if [[ ${rvm_auto_flag:-0} -eq 1 ]] ; then
 
         if ! grep -q '.profile' "$rcfile" ; then
 
-          echo "    Adding 'if [[ -s \$HOME/.profile ]] ; then source \$HOME ; fi' to $rcfile."
+          echo "    Adding profile sourcing line to $rcfile."
 
-          printf "\n# rvm-install added line:\nif [[ -s \$HOME/.profile ]] ; then source \$HOME/.profile ; fi\n" >> "$rcfile"
+          printf "
+# rvm-install added line:
+[[ -s \$HOME/.profile ]] && source \$HOME/.profile
+" >> "$rcfile"
 
         fi
 
@@ -331,9 +376,12 @@ if [[ ${rvm_auto_flag:-0} -eq 1 ]] ; then
 
       if ! grep -q "scripts\/rvm" "$rcfile" ; then
 
-        echo "    Adding 'if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi' to $rcfile."
+        echo "    Adding rvm loading line to $rcfile."
 
-        printf "\n# rvm-install added:\nif [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi\n" >> "$rcfile"
+        printf "
+# rvm-install added:
+[[ -s \"$rvm_path/.rvm/scripts/rvm\" ]] && . \"$rvm_path/.rvm/scripts/rvm\"
+" >> "$rcfile"
 
       fi
 
@@ -352,9 +400,10 @@ if [[ -d gemsets/ ]] ; then
 
   fi
 
-  for gemset_file in $(builtin cd gemsets ; find \. -iname '*.gems' | sed 's/^\.\///') ; do
+  for gemset_file in $(find "$PWD/gemsets" -iname '*.gems' | sed 's/^\.\///') ; do
 
-    destination="$rvm_path/gemsets/$gemset_file"
+    cwd="${PWD//\//\\/}\/gemsets\/"
+    destination="$rvm_path/gemsets/${gemset_file/$cwd}"
 
     destination_path="$(dirname "$destination")"
 
@@ -362,7 +411,7 @@ if [[ -d gemsets/ ]] ; then
 
       mkdir -p "$destination_path"
 
-      cp "gemsets/$gemset_file" "$destination"
+      cp "$gemset_file" "$destination"
 
     fi
 
@@ -404,7 +453,8 @@ fi
 #
 mkdir -p "${rvm_rubies_path:-"$rvm_path/rubies"}/"
 
-for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* $rvm_path/rbx-* $rvm_path/maglev-* $rvm_path/ree-* ; do
+for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* \
+  $rvm_path/rbx-* $rvm_path/maglev-* $rvm_path/ree-* ; do
 
   if [[ -d "$ruby" ]] ; then
 
@@ -416,7 +466,8 @@ for ruby in $rvm_path/ruby-* $rvm_path/jruby-* $rvm_path/mput-* $rvm_path/rbx-*
 
       if [[ -s "$new_path/bin/$file" ]] ; then
 
-        sed -e '1,1s=.*=#!'"${new_path}/bin/ruby=" "${new_path}/bin/${file}" > "${new_path}/bin/${file}.new"
+        sed -e '1,1s=.*=#!'"${new_path}/bin/ruby=" "${new_path}/bin/${file}" \
+          > "${new_path}/bin/${file}.new"
 
         mv -f "$new_path/bin/$file.new" "$new_path/bin/$file"
 
@@ -481,7 +532,8 @@ done
 # Move from legacy defaults to the new, alias based system.
 if [[ -s "$rvm_path/config/default" ]]; then
 
-  original_version="$(basename "$(grep GEM_HOME "$rvm_path/config/default" | awk -F"'" '{print $2}' | sed "s#\%#${rvm_gemset_separator:-"@"}#")")"
+  original_version="$(basename "$(grep GEM_HOME "$rvm_path/config/default" \
+    | awk -F"'" '{print $2}' | sed "s#\%#${rvm_gemset_separator:-"@"}#")")"
 
   if [[ -n "$original_version" ]]; then
 
@@ -505,19 +557,24 @@ mkdir -p "${rvm_bin_path:-"$rvm_path/bin"}"
 files=(rvm rvmsudo rvm-shell rvm-auto-ruby)
 for file in "${files[@]}" ; do
 
-  [[ -s "${rvm_bin_path:-"$rvm_path/bin"}/$file" ]] && chmod +x "${rvm_bin_path:-"$rvm_path/bin"}/$file"
+  if [[ -s "${rvm_bin_path:-"$rvm_path/bin"}/$file" ]] ; then
+
+    chmod +x "${rvm_bin_path:-"$rvm_path/bin"}/$file"
+
+  fi
 
 done
 
 printf "\n    Copying manpages into place."
 
-files=($(builtin cd "$install_source_path/man" ; find . -maxdepth 1 -mindepth 1 -type f -print))
+files=($(builtin cd "$install_source_path/man" ; \
+  find . -maxdepth 1 -mindepth 1 -type f -print))
 
 for file in "${files[@]//.\/}" ; do
 
-  rm -rf "$rvm_man_path/$man_file"
+  rm -rf "$rvm_man_path/$file"
 
-  cp -R "$install_source_path/man/$man_file" "$rvm_man_path/"
+  cp -R "$install_source_path/man/$file" "$rvm_man_path/"
 
 done
 
@@ -537,7 +594,7 @@ if [[ ${#files[@]} -gt 0 ]] ; then
 fi
 
 if [[ $upgrade_flag -eq 0 ]] ; then
-  chmod +x ./script/notes # Sometimes things don't clone properly :/
+  chmod +x ./scripts/notes # Sometimes things don't clone properly :/
   ./scripts/notes
 fi
 
@@ -549,8 +606,6 @@ if [[ ${upgrade_flag:-0} -eq 1 ]] ; then
 
   check_rubyopt_conditions
 
-  regenerate_wrappers
-
   printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"
 
 else