rvm 1.0.10 → 1.0.11

data/LICENCE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Wayne E. Seguin
+Copyright (c) 2009-2010 Wayne E. Seguin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

data/install

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-#set -u # Error on uninitialized variables.
+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
@@ -13,6 +14,7 @@ fi
 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
   builtin cd "$install_source_path"
 fi
@@ -34,21 +36,12 @@ usage() {
 }
 
 check_rubyopt_conditions() {
-  if [[ -n "$RUBYOPT" ]]; then
+  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"
   fi
 }
 
-# Regenerates a users wrappers as part of the update.
-regenerate_wrappers() {
-  printf "\n"
-  if command -v __rvm_regenerate_wrappers >/dev/null; then
-    __rvm_regenerate_wrappers
-  fi
-  printf "\n"
-}
-
 andand_return_instructions() {
   printf "
   This means that if you see something like:
@@ -158,7 +151,8 @@ Upgrade Notes
 "
 }
 
-if echo "$*" | grep -q 'trace' ; then echo "$*" ; env | grep '^rvm_' ; set -x ; fi
+set -o noclobber
+set -o nounset
 
 while [[ $# -gt 0 ]] ; do
   token="$1" ; shift
@@ -166,11 +160,19 @@ while [[ $# -gt 0 ]] ; do
     --auto)    rvm_auto_flag=1 ;;
     --prefix)  rvm_prefix="$1" ; shift ;;
     --version) rvm_path="$PWD" ; __rvm_version ; unset rvm_path ; exit ;;
+    --debug)
+      set -o verbose
+      ;;
+    --trace)
+      echo "$*"
+      env | grep '^rvm_'
+      set -o xtrace
+      ;;
     --help|*)  usage ;;
   esac
 done
 
-if [[ -z "$rvm_prefix" ]] ; then
+if [[ -z "${rvm_prefix:-""}" ]] ; then
   __rvm_load_rvmrc
   if [[ "$rvm_selfcontained" = "0" ]] ; then
     rvm_prefix="${rvm_prefix:-"/usr/local/"}"
@@ -179,7 +181,9 @@ if [[ -z "$rvm_prefix" ]] ; then
   fi
 fi
 
-if [[ -z "$rvm_path" ]] ; then rvm_path="${rvm_prefix}rvm" ; fi
+if [[ -z "${rvm_path:-""}" ]] ; then
+  rvm_path="${rvm_prefix}rvm"
+fi
 
 source scripts/initialize
 
@@ -233,7 +237,7 @@ 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"}" )
+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
 
@@ -303,11 +307,11 @@ chmod +x "${rvm_bin_path:-"$rvm_path/bin"}"/* # TODO: this is quite suboptimal.
 #
 # RC Files
 #
-if [[ -n "$rvm_auto_flag" ]] ; then
+if [[ ${rvm_auto_flag:-0} -eq 1 ]] ; then
 
   printf "Checking rc files... ($rvm_rc_files)"
 
-  if [[ "$rvm_loaded_flag" != "1" ]] ; then
+  if [[ ${rvm_loaded_flag:-0} -ne 1 ]] ; then
 
     for rcfile in $(printf $rvm_rc_files) ; do
 
@@ -492,22 +496,16 @@ fi
 #
 # End of gemset migration.
 #
+declare -a files
+
 printf "\n    Correct permissions for base binaries in $rvm_bin_path..."
 
 mkdir -p "${rvm_bin_path:-"$rvm_path/bin"}"
 
-for file in rvm rvmsudo rvm-shell rvm-auto-ruby ; do
-
-  [[ -s "${rvm_bin_path:-"$rvm_path/bin"}/$file" ]] && chmod +x "${rvm_bin_path:-"$rvm_path/bin"}/$file"
-
-done
-
-# Cleanup any .swp files that might have appeared.
-files=($( find "$rvm_path/" -mindepth 1 -maxdepth 2 -iname '*.swp' -type f ))
-
+files=(rvm rvmsudo rvm-shell rvm-auto-ruby)
 for file in "${files[@]}" ; do
 
-  [[ -f "$file" ]] && rm -f "$file"
+  [[ -s "${rvm_bin_path:-"$rvm_path/bin"}/$file" ]] && chmod +x "${rvm_bin_path:-"$rvm_path/bin"}/$file"
 
 done
 
@@ -523,7 +521,25 @@ for file in "${files[@]//.\/}" ; do
 
 done
 
-[[ "$upgrade_flag" = 0 ]] && ./scripts/notes
+files=($( find "$rvm_path/" -mindepth 1 -maxdepth 2 -iname '*.swp' -type f ))
+
+if [[ ${#files[@]} -gt 0 ]] ; then
+
+  printf "\n    Cleanup any .swp files."
+
+  for file in "${files[@]}" ; do
+
+    if [[ -f "$file" ]] ; then
+      rm -f "$file"
+    fi
+
+  done
+fi
+
+if [[ $upgrade_flag -eq 0 ]] ; then
+  chmod +x ./script/notes # Sometimes things don't clone properly :/
+  ./scripts/notes
+fi
 
 name="$(awk -F= '/^[[:space:]]*name/{print $2}' ~/.gitconfig 2>/dev/null)"
 
@@ -532,7 +548,7 @@ if [[ ${upgrade_flag:-0} -eq 1 ]] ; then
   upgrade_notes
 
   check_rubyopt_conditions
-  
+
   regenerate_wrappers
 
   printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 1
 :minor: 0
-:patch: 10
+:patch: 11

data/rvm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "1.0.10"
+  s.version = "1.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]
-  s.date = %q{2010-09-18}
+  s.date = %q{2010-09-20}
   s.default_executable = %q{rvm-install}
   s.description = %q{Manages Ruby interpreter environments and switching between them.}
   s.email = %q{wayneeseguin@gmail.com}

data/scripts/alias

@@ -26,8 +26,8 @@ alias_conflicts_with_ruby() {
   [[ "$1" == "default" && ! -L "$rvm_path/rubies/default" ]] && return 1
   # Open for suggestions to a better way of doing this...
   alias_check_result="$(
-    \. \"$rvm_path/scripts/initialize\"
-    \. \"$rvm_path/scripts/selector\"
+    \. "$rvm_path/scripts/initialize"
+    \. "$rvm_path/scripts/selector"
     export rvm_ruby_string=\"$1\"
     __rvm_ruby_string > /dev/null 2>&1
     echo "$?"

data/scripts/base

@@ -30,6 +30,10 @@ unset script_name rvm_base_except
 if [[ ${rvm_trace_flag:-0} -gt 0 ]]; then
   export rvm_trace_flag=1
   set -o xtrace
+
+  if [[ -z "${ZSH_VERSION:-""}" ]] ; then
+    export PS4='+[${BASH_SOURCE}] : ${LINENO} : ${FUNCNAME[0]:+${FUNCNAME[0]}() $ }'
+  fi
 fi
 
 if [[ -n "${ZSH_VERSION:-""}" ]] ; then

data/scripts/cd

@@ -3,12 +3,16 @@
 # Source a .rvmrc file in a directory after changing to it, if it exists.
 # To disable this fature, set export rvm_project_rvmrc=0 in $HOME/.rvmrc
 if [[ ${rvm_project_rvmrc:-1} -ne 0 ]] ; 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
       chpwd_functions=( "${chpwd_functions[@]}" __rvm_project_rvmrc )
     else
+
       cd() {
         builtin cd "$@"
         local result=$?
@@ -18,8 +22,11 @@ if [[ ${rvm_project_rvmrc:-1} -ne 0 ]] ; then
 
         return $result
       }
+
     fi
+
   else
+
     cd() {
       builtin cd "$@"
       local result=$?
@@ -29,5 +36,23 @@ if [[ ${rvm_project_rvmrc:-1} -ne 0 ]] ; then
 
       return $result
     }
+
+    _rvm_cd_complete ()
+    {
+      local cur matches
+      COMPREPLY=()
+      cur="${COMP_WORDS[COMP_CWORD]}"
+
+      matches=$(for dir in $(echo $CDPATH | tr -s ':' ' ') ; do
+        find $dir/* -type d -maxdepth 0 -exec basename {} \;
+      done | sort | uniq)
+
+      COMPREPLY=( $(compgen -W "${matches}" -- ${cur}) )
+    }
+
+    complete -o bashdefault -o default -o dirnames -o filenames -o nospace -o plusdirs -F _rvm_cd_complete cd
+
   fi
+
 fi
+

data/scripts/cli

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-__rvm_usage() { \less "${rvm_path:-$HOME/.rvm}/README" ; }
+__rvm_usage() { ${PAGER:-less} "${rvm_path:-$HOME/.rvm}/README" ; }
 
 __rvm_run_script() {
   local rvm_script_name="${1:-"$rvm_action"}"
@@ -337,7 +337,13 @@ __rvm_parse_args() {
         rvm_parse_break=1
       ;;
 
-      --passenger|--editor)
+      --passenger)
+        "$rvm_path/scripts/log" "info" \
+          "NOTE: If you are using Passenger 3 you no longer need the passenger_ruby,\nuse the wrapper script for your ruby instead (see 'rvm wrapper')"
+        rvm_wrapper_name="${rvm_token/--/}"
+      ;;
+
+      --editor)
         rvm_wrapper_name="${rvm_token/--/}"
       ;;
 

data/scripts/gemsets

@@ -308,8 +308,11 @@ gemset_empty() {
 gemset_copy() {
   local source_ruby destination_ruby source_path destination_path
 
-  source_ruby="${args[1]:-""}"
-  destination_ruby="${args[2]:-""}"
+  source_ruby="${args[__array_start]:-""}"
+  args[$__array_start]="" ; args=(${args[@]})
+
+  destination_ruby="${args[__array_start]:-""}"
+  args[$__array_start]="" ; args=(${args[@]})
 
   if [[ -z "$destination_ruby" || -z "$source_ruby" ]] ; then
     "$rvm_path/scripts/log" "error" "Source and destination must be specified: 'rvm gemset copy X Y'"
@@ -344,7 +347,7 @@ gemset_copy() {
 
       mkdir -p "$destination_path/$dir"
 
-      if [[ -d "$source_ruby/$dir" ]] ; then
+      if [[ -d "$source_path/$dir" ]] ; then
         cp -Rf "$source_path/$dir" "$destination_path/"
 
       elif [[ -L "$source_path/$dir" ]] ; then

data/scripts/help

@@ -15,22 +15,23 @@ args=(${args[@]})
 action="${args[$array_start]}"
 args[$__array_start]=""
 args=(${args[@]})
+pager="${PAGER:-less}"
 
 if [[ -n "$command" && -s "${rvm_help_path}/${command}" ]] ; then
 
   if [[ -n "$action" && -s "${rvm_help_path}/${command}/${action}" ]] ; then
 
-    less "${rvm_help_path}/${command}/${action}"
+    $pager "${rvm_help_path}/${command}/${action}"
 
   else
 
-    less "${rvm_help_path}/${command}"
+    $pager "${rvm_help_path}/${command}"
 
   fi
 
 else
 
-  less "${rvm_path:-$HOME/.rvm}/README"
+  $pager "${rvm_path:-$HOME/.rvm}/README"
 
   "$rvm_path/scripts/log" "info" \
     "Commands available with 'rvm help':\n\n    $(builtin cd "${rvm_help_path}" ; find . -maxdepth 1 -mindepth 1 -type f -print | \tr "\n" ' ' | sed -e 's#./##g')"

data/scripts/install

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-#set -u # Error on uninitialized variables.
+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
@@ -13,6 +14,7 @@ fi
 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
   builtin cd "$install_source_path"
 fi
@@ -34,21 +36,12 @@ usage() {
 }
 
 check_rubyopt_conditions() {
-  if [[ -n "$RUBYOPT" ]]; then
+  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"
   fi
 }
 
-# Regenerates a users wrappers as part of the update.
-regenerate_wrappers() {
-  printf "\n"
-  if command -v __rvm_regenerate_wrappers >/dev/null; then
-    __rvm_regenerate_wrappers
-  fi
-  printf "\n"
-}
-
 andand_return_instructions() {
   printf "
   This means that if you see something like:
@@ -158,7 +151,8 @@ Upgrade Notes
 "
 }
 
-if echo "$*" | grep -q 'trace' ; then echo "$*" ; env | grep '^rvm_' ; set -x ; fi
+set -o noclobber
+set -o nounset
 
 while [[ $# -gt 0 ]] ; do
   token="$1" ; shift
@@ -166,11 +160,19 @@ while [[ $# -gt 0 ]] ; do
     --auto)    rvm_auto_flag=1 ;;
     --prefix)  rvm_prefix="$1" ; shift ;;
     --version) rvm_path="$PWD" ; __rvm_version ; unset rvm_path ; exit ;;
+    --debug)
+      set -o verbose
+      ;;
+    --trace)
+      echo "$*"
+      env | grep '^rvm_'
+      set -o xtrace
+      ;;
     --help|*)  usage ;;
   esac
 done
 
-if [[ -z "$rvm_prefix" ]] ; then
+if [[ -z "${rvm_prefix:-""}" ]] ; then
   __rvm_load_rvmrc
   if [[ "$rvm_selfcontained" = "0" ]] ; then
     rvm_prefix="${rvm_prefix:-"/usr/local/"}"
@@ -179,7 +181,9 @@ if [[ -z "$rvm_prefix" ]] ; then
   fi
 fi
 
-if [[ -z "$rvm_path" ]] ; then rvm_path="${rvm_prefix}rvm" ; fi
+if [[ -z "${rvm_path:-""}" ]] ; then
+  rvm_path="${rvm_prefix}rvm"
+fi
 
 source scripts/initialize
 
@@ -233,7 +237,7 @@ 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"}" )
+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
 
@@ -303,11 +307,11 @@ chmod +x "${rvm_bin_path:-"$rvm_path/bin"}"/* # TODO: this is quite suboptimal.
 #
 # RC Files
 #
-if [[ -n "$rvm_auto_flag" ]] ; then
+if [[ ${rvm_auto_flag:-0} -eq 1 ]] ; then
 
   printf "Checking rc files... ($rvm_rc_files)"
 
-  if [[ "$rvm_loaded_flag" != "1" ]] ; then
+  if [[ ${rvm_loaded_flag:-0} -ne 1 ]] ; then
 
     for rcfile in $(printf $rvm_rc_files) ; do
 
@@ -492,22 +496,16 @@ fi
 #
 # End of gemset migration.
 #
+declare -a files
+
 printf "\n    Correct permissions for base binaries in $rvm_bin_path..."
 
 mkdir -p "${rvm_bin_path:-"$rvm_path/bin"}"
 
-for file in rvm rvmsudo rvm-shell rvm-auto-ruby ; do
-
-  [[ -s "${rvm_bin_path:-"$rvm_path/bin"}/$file" ]] && chmod +x "${rvm_bin_path:-"$rvm_path/bin"}/$file"
-
-done
-
-# Cleanup any .swp files that might have appeared.
-files=($( find "$rvm_path/" -mindepth 1 -maxdepth 2 -iname '*.swp' -type f ))
-
+files=(rvm rvmsudo rvm-shell rvm-auto-ruby)
 for file in "${files[@]}" ; do
 
-  [[ -f "$file" ]] && rm -f "$file"
+  [[ -s "${rvm_bin_path:-"$rvm_path/bin"}/$file" ]] && chmod +x "${rvm_bin_path:-"$rvm_path/bin"}/$file"
 
 done
 
@@ -523,7 +521,25 @@ for file in "${files[@]//.\/}" ; do
 
 done
 
-[[ "$upgrade_flag" = 0 ]] && ./scripts/notes
+files=($( find "$rvm_path/" -mindepth 1 -maxdepth 2 -iname '*.swp' -type f ))
+
+if [[ ${#files[@]} -gt 0 ]] ; then
+
+  printf "\n    Cleanup any .swp files."
+
+  for file in "${files[@]}" ; do
+
+    if [[ -f "$file" ]] ; then
+      rm -f "$file"
+    fi
+
+  done
+fi
+
+if [[ $upgrade_flag -eq 0 ]] ; then
+  chmod +x ./script/notes # Sometimes things don't clone properly :/
+  ./scripts/notes
+fi
 
 name="$(awk -F= '/^[[:space:]]*name/{print $2}' ~/.gitconfig 2>/dev/null)"
 
@@ -532,7 +548,7 @@ if [[ ${upgrade_flag:-0} -eq 1 ]] ; then
   upgrade_notes
 
   check_rubyopt_conditions
-  
+
   regenerate_wrappers
 
   printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"

data/scripts/list

@@ -200,7 +200,7 @@ list_known() {
 
   else
 
-    less "$rvm_path/config/known"
+    ${PAGER:-less} "$rvm_path/config/known"
 
   fi
 

data/scripts/repair

@@ -3,17 +3,47 @@
 source "$rvm_path/scripts/base"
 
 usage() {
-  echo "Usage: rvm repair {wrappers,symlinks,environments,archives,all}" >&2
-  return 1
+  printf "
+  Usage:
+
+    rvm repair [option]
+
+  Options:
+    wrappers     - Repair wrappers
+    symlinks     - Repair symlinks
+    environments - Repair environments
+    archives     - Repair archives
+    all          - Repair all of the above
+
+"
 }
 
 repair_wrappers() {
-  __rvm_regenerate_wrappers
+
+  local wrapper_ruby_name
+
+  "$rvm_path/scripts/log" "info" "Regenerating all wrappers..."
+
+  while read -r wrapper_ruby_name ; do
+
+    "$rvm_path/scripts/log" "info" \
+      "Regenerating wrappers for $wrapper_ruby_name"
+
+    __rvm_run "wrappers.regenerate" \
+      "\"$rvm_path/scripts/wrapper\" '$wrapper_ruby_name'"
+
+  done < <("$rvm_path/scripts/list" gemsets strings)
+
+  "$rvm_path/scripts/log" "info" "Wrappers regenerated"
+
 }
 
 # Removes stale symlinks in $rvm_bin_path, likely
 # related to wrappers.
 repair_symlinks() {
+
+  "$rvm_path/scripts/log" "info" "Repairing symlinks..."
+
   (
     builtin cd "${rvm_bin_path:-"$rvm_path/bin"}"
 
@@ -24,19 +54,23 @@ repair_symlinks() {
       if [[ -f "$executable_name" ]]  ; then
 
         "$rvm_path/scripts/log" "info" \
-          "Removing stale symlink from $(basename "$executable_name")"
+          "removing stale symlink from $(basename "$executable_name")"
 
         \rm -f "$executable_name"
 
       fi
     done
   )
+
+  "$rvm_path/scripts/log" "info" "Symlinks repaired"
 }
 
 # Regenerates each symlink file.
 repair_environments() {
   local environment_name environments
 
+  "$rvm_path/scripts/log" "info" "Regenerating environments..."
+
   environments=($(cd "$rvm_path/environments" ; find . -maxdepth 1 -mindepth 1 -type f))
 
   for environment_name in "${environments[@]//.\/}" ; do
@@ -57,12 +91,17 @@ repair_environments() {
     )
 
   done
+
+  "$rvm_path/scripts/log" "info" "Environments regenerated"
+
+  return 0
 }
 
 # Removes archives that have incorrect md5 sums.
 repair_archives() {
 
   local archive_file archives stored_md5sum
+  "$rvm_path/scripts/log" "info" "Repairing archives..."
 
   archives=($(cd "${rvm_archives_path:-"$rvm_path/archives"}" ; find . -maxdepth 1 -mindepth 1 -type f))
 
@@ -83,6 +122,8 @@ repair_archives() {
     fi
   done
 
+  "$rvm_path/scripts/log" "info" "Archives repaired"
+
   return 0
 }
 
@@ -96,15 +137,13 @@ repair_all() {
 
   repair_wrappers
 
-  "$rvm_path/scripts/log" "info" \
-    "symlinks, archives and environments have been repaired."
-
   return 0
 }
 
 args=($*)
-action="${args[0]}"
-args="$(echo ${args[@]:1}) " # Strip trailing / leading / extra spacing.
+action="${args[$__array_start]}"
+args[$__array_start]=""
+args=(${args[@]})
 
 if [[ -z "$action" ]]; then
   usage
@@ -117,7 +156,8 @@ case "$action" in
   environments) repair_environments ;;
   archives)     repair_archives     ;;
   wrappers)     repair_wrappers     ;;
-  *)            usage               ;;
+  help)         usage               ;;
+  *)            usage >&2 ; exit 1  ;;
 esac
 
 exit $?

data/scripts/rvm-install

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-#set -u # Error on uninitialized variables.
+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
@@ -13,6 +14,7 @@ fi
 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
   builtin cd "$install_source_path"
 fi
@@ -34,21 +36,12 @@ usage() {
 }
 
 check_rubyopt_conditions() {
-  if [[ -n "$RUBYOPT" ]]; then
+  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"
   fi
 }
 
-# Regenerates a users wrappers as part of the update.
-regenerate_wrappers() {
-  printf "\n"
-  if command -v __rvm_regenerate_wrappers >/dev/null; then
-    __rvm_regenerate_wrappers
-  fi
-  printf "\n"
-}
-
 andand_return_instructions() {
   printf "
   This means that if you see something like:
@@ -158,7 +151,8 @@ Upgrade Notes
 "
 }
 
-if echo "$*" | grep -q 'trace' ; then echo "$*" ; env | grep '^rvm_' ; set -x ; fi
+set -o noclobber
+set -o nounset
 
 while [[ $# -gt 0 ]] ; do
   token="$1" ; shift
@@ -166,11 +160,19 @@ while [[ $# -gt 0 ]] ; do
     --auto)    rvm_auto_flag=1 ;;
     --prefix)  rvm_prefix="$1" ; shift ;;
     --version) rvm_path="$PWD" ; __rvm_version ; unset rvm_path ; exit ;;
+    --debug)
+      set -o verbose
+      ;;
+    --trace)
+      echo "$*"
+      env | grep '^rvm_'
+      set -o xtrace
+      ;;
     --help|*)  usage ;;
   esac
 done
 
-if [[ -z "$rvm_prefix" ]] ; then
+if [[ -z "${rvm_prefix:-""}" ]] ; then
   __rvm_load_rvmrc
   if [[ "$rvm_selfcontained" = "0" ]] ; then
     rvm_prefix="${rvm_prefix:-"/usr/local/"}"
@@ -179,7 +181,9 @@ if [[ -z "$rvm_prefix" ]] ; then
   fi
 fi
 
-if [[ -z "$rvm_path" ]] ; then rvm_path="${rvm_prefix}rvm" ; fi
+if [[ -z "${rvm_path:-""}" ]] ; then
+  rvm_path="${rvm_prefix}rvm"
+fi
 
 source scripts/initialize
 
@@ -233,7 +237,7 @@ 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"}" )
+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
 
@@ -303,11 +307,11 @@ chmod +x "${rvm_bin_path:-"$rvm_path/bin"}"/* # TODO: this is quite suboptimal.
 #
 # RC Files
 #
-if [[ -n "$rvm_auto_flag" ]] ; then
+if [[ ${rvm_auto_flag:-0} -eq 1 ]] ; then
 
   printf "Checking rc files... ($rvm_rc_files)"
 
-  if [[ "$rvm_loaded_flag" != "1" ]] ; then
+  if [[ ${rvm_loaded_flag:-0} -ne 1 ]] ; then
 
     for rcfile in $(printf $rvm_rc_files) ; do
 
@@ -492,22 +496,16 @@ fi
 #
 # End of gemset migration.
 #
+declare -a files
+
 printf "\n    Correct permissions for base binaries in $rvm_bin_path..."
 
 mkdir -p "${rvm_bin_path:-"$rvm_path/bin"}"
 
-for file in rvm rvmsudo rvm-shell rvm-auto-ruby ; do
-
-  [[ -s "${rvm_bin_path:-"$rvm_path/bin"}/$file" ]] && chmod +x "${rvm_bin_path:-"$rvm_path/bin"}/$file"
-
-done
-
-# Cleanup any .swp files that might have appeared.
-files=($( find "$rvm_path/" -mindepth 1 -maxdepth 2 -iname '*.swp' -type f ))
-
+files=(rvm rvmsudo rvm-shell rvm-auto-ruby)
 for file in "${files[@]}" ; do
 
-  [[ -f "$file" ]] && rm -f "$file"
+  [[ -s "${rvm_bin_path:-"$rvm_path/bin"}/$file" ]] && chmod +x "${rvm_bin_path:-"$rvm_path/bin"}/$file"
 
 done
 
@@ -523,7 +521,25 @@ for file in "${files[@]//.\/}" ; do
 
 done
 
-[[ "$upgrade_flag" = 0 ]] && ./scripts/notes
+files=($( find "$rvm_path/" -mindepth 1 -maxdepth 2 -iname '*.swp' -type f ))
+
+if [[ ${#files[@]} -gt 0 ]] ; then
+
+  printf "\n    Cleanup any .swp files."
+
+  for file in "${files[@]}" ; do
+
+    if [[ -f "$file" ]] ; then
+      rm -f "$file"
+    fi
+
+  done
+fi
+
+if [[ $upgrade_flag -eq 0 ]] ; then
+  chmod +x ./script/notes # Sometimes things don't clone properly :/
+  ./scripts/notes
+fi
 
 name="$(awk -F= '/^[[:space:]]*name/{print $2}' ~/.gitconfig 2>/dev/null)"
 
@@ -532,7 +548,7 @@ if [[ ${upgrade_flag:-0} -eq 1 ]] ; then
   upgrade_notes
 
   check_rubyopt_conditions
-  
+
   regenerate_wrappers
 
   printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"

data/scripts/selector

@@ -428,26 +428,20 @@ __rvm_ruby_string() {
   rvm_ruby_revision=${rvm_ruby_revision:-""}
   rvm_ruby_tag=${rvm_ruby_tag:-""}
 
-  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:-"@"}*/}"
-    rvm_sticky_flag=1
-  fi
-
   # Alias'd rubies
   if [[ ${rvm_expanding_aliases:-0} -eq 0 && -n ${rvm_ruby_string:-""} && $rvm_ruby_string != "system" ]]; then
-
     if expanded_alias_name="$("$rvm_path/scripts/alias" show "$rvm_ruby_string" 2>/dev/null)" && [[ -n "$expanded_alias_name" ]] ; then
-
       rvm_ruby_string="$expanded_alias_name"
-
     elif [[ "$rvm_ruby_string" = default ]]; then
-
       # Default is not a known value. Instead, we need to therefore set it to system.
       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:-"@"}*/}"
+    rvm_sticky_flag=1
   fi
 
   ruby_string=${rvm_ruby_string/${rvm_gemset_separator:-"@"}*/}

data/scripts/update

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-#set -u # Error on uninitialized variables.
+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
@@ -13,6 +14,7 @@ fi
 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
   builtin cd "$install_source_path"
 fi
@@ -34,21 +36,12 @@ usage() {
 }
 
 check_rubyopt_conditions() {
-  if [[ -n "$RUBYOPT" ]]; then
+  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"
   fi
 }
 
-# Regenerates a users wrappers as part of the update.
-regenerate_wrappers() {
-  printf "\n"
-  if command -v __rvm_regenerate_wrappers >/dev/null; then
-    __rvm_regenerate_wrappers
-  fi
-  printf "\n"
-}
-
 andand_return_instructions() {
   printf "
   This means that if you see something like:
@@ -158,7 +151,8 @@ Upgrade Notes
 "
 }
 
-if echo "$*" | grep -q 'trace' ; then echo "$*" ; env | grep '^rvm_' ; set -x ; fi
+set -o noclobber
+set -o nounset
 
 while [[ $# -gt 0 ]] ; do
   token="$1" ; shift
@@ -166,11 +160,19 @@ while [[ $# -gt 0 ]] ; do
     --auto)    rvm_auto_flag=1 ;;
     --prefix)  rvm_prefix="$1" ; shift ;;
     --version) rvm_path="$PWD" ; __rvm_version ; unset rvm_path ; exit ;;
+    --debug)
+      set -o verbose
+      ;;
+    --trace)
+      echo "$*"
+      env | grep '^rvm_'
+      set -o xtrace
+      ;;
     --help|*)  usage ;;
   esac
 done
 
-if [[ -z "$rvm_prefix" ]] ; then
+if [[ -z "${rvm_prefix:-""}" ]] ; then
   __rvm_load_rvmrc
   if [[ "$rvm_selfcontained" = "0" ]] ; then
     rvm_prefix="${rvm_prefix:-"/usr/local/"}"
@@ -179,7 +181,9 @@ if [[ -z "$rvm_prefix" ]] ; then
   fi
 fi
 
-if [[ -z "$rvm_path" ]] ; then rvm_path="${rvm_prefix}rvm" ; fi
+if [[ -z "${rvm_path:-""}" ]] ; then
+  rvm_path="${rvm_prefix}rvm"
+fi
 
 source scripts/initialize
 
@@ -233,7 +237,7 @@ 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"}" )
+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
 
@@ -303,11 +307,11 @@ chmod +x "${rvm_bin_path:-"$rvm_path/bin"}"/* # TODO: this is quite suboptimal.
 #
 # RC Files
 #
-if [[ -n "$rvm_auto_flag" ]] ; then
+if [[ ${rvm_auto_flag:-0} -eq 1 ]] ; then
 
   printf "Checking rc files... ($rvm_rc_files)"
 
-  if [[ "$rvm_loaded_flag" != "1" ]] ; then
+  if [[ ${rvm_loaded_flag:-0} -ne 1 ]] ; then
 
     for rcfile in $(printf $rvm_rc_files) ; do
 
@@ -492,22 +496,16 @@ fi
 #
 # End of gemset migration.
 #
+declare -a files
+
 printf "\n    Correct permissions for base binaries in $rvm_bin_path..."
 
 mkdir -p "${rvm_bin_path:-"$rvm_path/bin"}"
 
-for file in rvm rvmsudo rvm-shell rvm-auto-ruby ; do
-
-  [[ -s "${rvm_bin_path:-"$rvm_path/bin"}/$file" ]] && chmod +x "${rvm_bin_path:-"$rvm_path/bin"}/$file"
-
-done
-
-# Cleanup any .swp files that might have appeared.
-files=($( find "$rvm_path/" -mindepth 1 -maxdepth 2 -iname '*.swp' -type f ))
-
+files=(rvm rvmsudo rvm-shell rvm-auto-ruby)
 for file in "${files[@]}" ; do
 
-  [[ -f "$file" ]] && rm -f "$file"
+  [[ -s "${rvm_bin_path:-"$rvm_path/bin"}/$file" ]] && chmod +x "${rvm_bin_path:-"$rvm_path/bin"}/$file"
 
 done
 
@@ -523,7 +521,25 @@ for file in "${files[@]//.\/}" ; do
 
 done
 
-[[ "$upgrade_flag" = 0 ]] && ./scripts/notes
+files=($( find "$rvm_path/" -mindepth 1 -maxdepth 2 -iname '*.swp' -type f ))
+
+if [[ ${#files[@]} -gt 0 ]] ; then
+
+  printf "\n    Cleanup any .swp files."
+
+  for file in "${files[@]}" ; do
+
+    if [[ -f "$file" ]] ; then
+      rm -f "$file"
+    fi
+
+  done
+fi
+
+if [[ $upgrade_flag -eq 0 ]] ; then
+  chmod +x ./script/notes # Sometimes things don't clone properly :/
+  ./scripts/notes
+fi
 
 name="$(awk -F= '/^[[:space:]]*name/{print $2}' ~/.gitconfig 2>/dev/null)"
 
@@ -532,7 +548,7 @@ if [[ ${upgrade_flag:-0} -eq 1 ]] ; then
   upgrade_notes
 
   check_rubyopt_conditions
-  
+
   regenerate_wrappers
 
   printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"

data/scripts/utility

@@ -242,11 +242,14 @@ __rvm_run() {
   fi
 
   if [[ ${rvm_debug_flag:-0} -gt 0 ]] ; then
-    "$rvm_path/scripts/log" "debug" \
-      "Executing: $command"
+    "$rvm_path/scripts/log" "debug" "Executing: $command"
   fi
 
-  path="${rvm_log_path:-"$rvm_path/log"}/$rvm_ruby_string"
+  if [[ -n "${rvm_ruby_string:-""}" ]] ; then
+    path="${rvm_log_path:-"$rvm_path/log"}/$rvm_ruby_string"
+  else
+    path="${rvm_log_path:-"$rvm_path/log"}"
+  fi
 
   log="$path/$name.log"
 
@@ -256,7 +259,7 @@ __rvm_run() {
 
   \touch "$log" "${log/%.log/.error.log}" # for zsh :(
 
-  printf "[$(date +'%Y-%m-%d %H:%M:%S')] $command" | \
+  printf "[$(date +'%Y-%m-%d %H:%M:%S')] $command\n" | \
     \tee "$log" \
     >> "${log/%log/error.log}"
 
@@ -1370,11 +1373,3 @@ __rvm_expand_ruby_string() {
 
   return $?
 }
-
-__rvm_regenerate_wrappers() {
-  echo "Regenerating all wrappers..."
-  while read -r wrapper_ruby_name; do
-    __rvm_run "wrappers.regenerate" "\"$rvm_path/scripts/wrapper\" '$wrapper_ruby_name'"
-  done < <(rvm list gemsets strings)
-  unset wrapper_ruby_name
-}

data/scripts/wrapper

@@ -34,7 +34,7 @@ wrap() {
     if [[ "root" = "$USER" ]] ; then
       path="${rvm_path:-"/usr/local/rvm"}"
     else
-      path="\$HOME/.rvm"
+      path="$HOME/.rvm"
     fi
 
     printf "#!/usr/bin/env bash
@@ -43,18 +43,21 @@ if [[ -s \"$path/environments/${environment_identifier}\" ]] ; then
   \\. \"$path/environments/${environment_identifier}\"
   exec $binary_name \"\$@\"
 else
-  echo \"ERROR: Missing RVM environment file: '$path/environments/${environment_identifier}'\"
+  echo \"ERROR: Missing RVM environment file: '$path/environments/${environment_identifier}'\" >&2
   exit 1
 fi
   " > "$file_name"
 
-    if [[ -f "$file_name" ]] ; then chmod +x "$file_name" ; fi
+    if [[ -f "$file_name" ]] ; then
+      chmod +x "$file_name"
+    fi
 
     return 0
 
   else
 
-    "$rvm_path/scripts/log" "error" "wrap() : file_name unset variable."
+    "$rvm_path/scripts/log" "error" \
+      "wrap() : file_name unkown variable for wrap()."
 
     return 1
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 1
   - 0
-  - 10
-  version: 1.0.10
+  - 11
+  version: 1.0.11
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-18 00:00:00 -04:00
+date: 2010-09-20 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []