rvm 1.0.11 → 1.0.13

data/scripts/hash

@@ -13,7 +13,8 @@ if [[ "$rvm_trace_flag" -eq 2 ]] ; then set -x ; export rvm_trace_flag ; fi
 
 if [[ -n "${ZSH_VERSION:-""}" ]] ; then __array_start=1 ; else __array_start=0 ; fi
 
-hash() {
+hash()
+{
   hash_name=$1 ; hash_key=$2 ; hash_value=$3
 
   eval "_hash_${hash_name}_keys=\${_hash_${hash_name}_keys:-()} ; _hash_${hash_name}_values=\${_hash_${hash_name}_values:-()}"

data/scripts/info

@@ -6,7 +6,8 @@ source "$rvm_path/scripts/base"
 
 source "$rvm_path/scripts/version"
 
-version_for() {
+version_for()
+{
   local binary=${1:-""}
 
   if command -v "$binary" >/dev/null ; then
@@ -18,7 +19,8 @@ version_for() {
   return 0
 }
 
-info_system() {
+info_system()
+{
   rvm_info="
   system:
     uname:       \"$(uname -a)\"
@@ -27,7 +29,8 @@ info_system() {
 "
 }
 
-info_rvm() {
+info_rvm()
+{
   rvm_info="
   rvm:
     version:      \"$(__rvm_version | \tr "\n" ' ' | __rvm_strip)\"
@@ -35,7 +38,8 @@ info_rvm() {
 
 }
 
-info_ruby() {
+info_ruby()
+{
   [[ "$(__rvm_environment_identifier)" == "system" ]] && return
   ruby=$(command -v ruby)
   if [[ $? -eq 0 ]] && [[ -x "$ruby" ]] ; then full_version="$($ruby -v)" ; fi
@@ -51,7 +55,8 @@ info_ruby() {
 
 }
 
-info_homes() {
+info_homes()
+{
   rvm_info="
   homes:
     gem:          \"${GEM_HOME:-"not set"}\"
@@ -59,7 +64,8 @@ info_homes() {
 "
 }
 
-info_binaries() {
+info_binaries()
+{
   rvm_info="
   binaries:
     ruby:         \"$(command -v ruby)\"
@@ -69,7 +75,8 @@ info_binaries() {
 "
 }
 
-info_environment() {
+info_environment()
+{
   rvm_info="
   environment:
     PATH:         \"${PATH:-""}\"
@@ -89,7 +96,8 @@ info_environment() {
   rvm_info="$rvm_info\n"
 }
 
-info_debug() {
+info_debug()
+{
   rvm_info="
 
 $(__rvm_version)
@@ -144,7 +152,8 @@ $(__rvm_version)
   rvm_info="$rvm_info\ngem sources:\n$(gem sources | awk '/gems/')\n\n"
 }
 
-info_sections() {
+info_sections()
+{
 
   for section in $(printf "${sections//,/ }") ; do
 

data/scripts/install

@@ -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

data/scripts/list

@@ -4,7 +4,8 @@ rvm_base_except="selector"
 
 source "$rvm_path/scripts/base"
 
-usage() {
+usage()
+{
   printf "
   Usage:
 
@@ -12,13 +13,15 @@ usage() {
 
   Actions:
 
-  {help,known,gemsets,default [string],rubies,strings,known_strings}
+  {help,known,gemsets,default [string],rubies,strings,known_strings,ruby_svn_tags}
 
 "
+
   return 0
 }
 
-list_gemsets() {
+list_gemsets()
+{
   local all_rubies version versions ruby_version_name current_ruby selected system_ruby system_version string binary
 
   if [[ "${1:-""}" = "strings" ]]; then
@@ -93,7 +96,8 @@ list_gemsets() {
   return 0
 }
 
-list_default() {
+list_default()
+{
 
   local version string
 
@@ -128,8 +132,8 @@ list_default() {
   return 0
 }
 
-list_ruby_svn_tags() {
-
+list_ruby_svn_tags()
+{
   local prefix tag
 
   while read -r tag
@@ -145,8 +149,8 @@ list_ruby_svn_tags() {
 
 # Query for valid rvm ruby strings
 # This is meant to be used with scripting.
-list_strings() {
-
+list_strings()
+{
   (
   cd "$rvm_path/rubies"
 
@@ -157,8 +161,8 @@ list_strings() {
 }
 
 # This is meant to be used with scripting.
-list_gemset_strings() {
-
+list_gemset_strings()
+{
   local all_rubies ruby_name gemset gemsets
 
   all_rubies="$(list_strings)"
@@ -178,15 +182,15 @@ list_gemset_strings() {
 }
 
 # This is meant to be used with scripting.
-list_known_strings() {
-
+list_known_strings()
+{
   sed -e 's/#.*$//g' -e 's#\[##g' -e 's#\]##g' < "$rvm_path/config/known" | sort -r | uniq
 
   return $?
 }
 
-list_known() {
-
+list_known()
+{
   if [[ "${1:-""}" = "strings" ]]; then
 
     list_known_strings
@@ -207,15 +211,15 @@ list_known() {
   return $?
 }
 
-list_rubies_strings() {
-
+list_rubies_strings()
+{
   ( builtin cd "$rvm_path/rubies" ; find -maxdepth 0 -type d | tail -n+2 | xargs -n1 basename -- |  __rvm_strip )
 
   return $?
 }
 
-list_rubies() {
-
+list_rubies()
+{
   local current_ruby rubies version selected system_ruby system_version string binary
 
   if [[ "${1:-""}" = "strings" ]]; then list_rubies_strings ; return 0 ; fi