rvm 1.0.11 → 1.0.13

data/scripts/migrate

@@ -4,7 +4,8 @@ unset GREP_OPTIONS
 
 source "$rvm_path/scripts/base"
 
-usage() {
+usage()
+{
   printf "
 
   Usage:
@@ -18,7 +19,8 @@ usage() {
 " >&2
 }
 
-confirm() {
+confirm()
+{
   local confirmation_response
 
   printf "$1 (Y/n): "
@@ -28,16 +30,20 @@ confirm() {
   [[ -z "$confirmation_response" ]] || echo "$confirmation_response" | \grep -qi '^y'
 }
 
-die_with_error() {
+die_with_error()
+{
   "$rvm_path/scripts/log" "fail" "$1"
+
   exit "${2:-1}"
 }
 
-expand_ruby_name() {
+expand_ruby_name()
+{
   "$rvm_path/scripts/tools" strings "$1" | awk -F"${rvm_gemset_separator:-"@"}" '{print $1}'
 }
 
-migrate_rubies() {
+migrate_rubies()
+{
   local origin_gemset destination_gemset gemset_name migrate_ruby_name migrate_alias_name migrate_new_alias_name binaries origin_wrappers_path full_bin_path expanded_symlink linked_binary_name new_wrapper_destination
 
   expanded_source="$(expand_ruby_name "$source_ruby")"

data/scripts/monitor

@@ -7,7 +7,8 @@ source "$rvm_path/scripts/base"
 
 rvm_monitor_sleep="${rvm_monitor_sleep:-2}"
 
-timestamp() {
+timestamp()
+{
   if [[ "Darwin" = "$(uname)" ]] ; then
     echo $(stat -f "%m" $1)
   else
@@ -15,20 +16,29 @@ timestamp() {
   fi
 }
 
-push_if_timestamp_changed() {
-  file=$1
-  file_timestamp=$(timestamp $file)
+push_if_timestamp_changed()
+{
+  local file=$1
+
+  local file_timestamp=$(timestamp "$file")
 
   eval "time=\$${framework}_timestamp"
+
   if [[ "$file_timestamp" -gt $time ]] ; then
+
     array_push "changed_${framework}_files" $file
+
   fi
 }
 
-update_timestamp() {
+update_timestamp()
+{
   if [[ -d "${1}/" ]] ; then
+
     \touch "$rvm_path/${$}_${1}_timestamp"
+
     eval "${1}_timestamp=\$(timestamp \"$rvm_path/${$}_${1}_timestamp\")"
+
   fi
 }
 

data/scripts/notes

@@ -63,8 +63,8 @@ dependencies:
   rvm: bash curl git
 
   # For MRI based rubies you will need:
-  ruby: pacman -Sy --noconfirm patch curl bison zlib readline libxml2 git
-  ruby-head: pacman -Sy --noconfirm subversion autoconf diffutils patch bison
+  ruby: pacman -Sy --noconfirm patch curl bison zlib readline libxml2 git make
+  ruby-head: pacman -Sy --noconfirm subversion autoconf diffutils patch bison make
 
   # For JRuby (if you wish to use it) you will need:
   jruby: pacman -Sy --noconfirm jdk jre curl

data/scripts/override_gem

@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 
 if [[ ${rvm_leave_gem_alone:-0} -eq 0 ]]; then
-  gem() {
+  gem()
+  {
     local result
 
     command gem "$@" ; result="$?"

data/scripts/package

@@ -5,8 +5,8 @@ if [[ "$rvm_trace_flag" -eq 2 ]] ; then set -x ; export rvm_trace_flag ; fi
 rvm_base_except="selector"
 source "$rvm_path/scripts/base"
 
-install_package() {
-
+install_package()
+{
   __rvm_db "${package}_url" "package_url"
 
   if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
@@ -93,7 +93,8 @@ install_package() {
   return ${result:-0}
 }
 
-readline() {
+readline()
+{
   package="readline" ; archive_format="tar.gz"
   for version in 5.2 6.0 ; do
     configure_flags="--disable-dependency-tracking --disable-static --enable-shared"
@@ -101,17 +102,20 @@ readline() {
   done
 }
 
-iconv() {
+iconv()
+{
   package="libiconv" ; version=1.13.1 ; archive_format="tar.gz"
   install_package
 }
 
-curl() {
+curl()
+{
   package="curl" ; version=7.19.7 ; archive_format="tar.gz"
   install_package
 }
 
-openssl() {
+openssl()
+{
   package="openssl" ; version="0.9.8n" ; archive_format="tar.gz"
   if [[ "Darwin" = "$(uname)" ]] ; then
 
@@ -159,34 +163,40 @@ openssl() {
   install_package
 }
 
-zlib() {
+zlib()
+{
   package="zlib" ; version="1.2.5" ; archive_format="tar.gz"
   install_package
 }
 
-autoconf() {
+autoconf()
+{
   package="autoconf" ; version="2.65" ; archive_format="tar.gz"
   prefix_path="$usr_path"
   install_package
 }
 
-ncurses() {
+ncurses()
+{
   package="ncurses" ; version="5.7" ; archive_format="tar.gz"
   configure_flags="--with-shared --disable-rpath --without-debug --without-ada --enable-safe-sprintf --enable-sigwinch --without-progs"
   install_package
 }
 
-pkgconfig() {
+pkgconfig()
+{
   package="pkg-config" ; version="0.23" archive_format="tar.gz"
   install_package
 }
 
-gettext() {
+gettext()
+{
   package="gettext" ; version="0.17" ; archive_format="tar.gz"
   install_package
 }
 
-libxml2() {
+libxml2()
+{
   package="libxml2" ; version="2.7.3" ; archive_format="tar.gz"
   if [[ "Darwin" = "$(uname)" ]] ; then
     configure="./configure --prefix=$usr_path --build=i686-apple-darwin$(uname -r) --host=i686-apple-darwin$(uname -r)"
@@ -195,7 +205,8 @@ libxml2() {
   unset prefix_path
 }
 
-glib() {
+glib()
+{
   pkgconfig
   gettext
   package="glib" ; version="2.23.1" ; archive_format="tar.gz"
@@ -204,7 +215,8 @@ glib() {
   install_package
 }
 
-mono() {
+mono()
+{
   glib
 
   __rvm_mono_env
@@ -212,7 +224,8 @@ mono() {
   install_package
 }
 
-llvm() {
+llvm()
+{
   package="llvm" ; version="89156"
   if [[ ! -z "$rvm_make_flags_flag" ]] ; then __rvm_make_flags ; fi
   (

data/scripts/patches

@@ -4,7 +4,8 @@
 # and dealing with patches.
 
 # Returns the path used to look for a patch given a specific name.
-__rvm_patch_lookup_path() {
+__rvm_patch_lookup_path()
+{
   echo "/"
 
   [[ -n "${rvm_patch_original_pwd:-""}" ]] && echo "$rvm_patch_original_pwd/"
@@ -16,7 +17,8 @@ __rvm_patch_lookup_path() {
   return $?
 }
 
-__rvm_expand_patch_name() {
+__rvm_expand_patch_name()
+{
   local name expanded_patch_name
 
   name="${1:-""}"
@@ -36,7 +38,8 @@ __rvm_expand_patch_name() {
 }
 
 # Return the full patch for a given patch.
-__rvm_lookup_full_patch_path() {
+__rvm_lookup_full_patch_path()
+{
   local extension patch_path directory directories
 
   # Absolute path, pwd and then finally the rvm patches path.

data/scripts/patchsets

@@ -6,7 +6,8 @@ source "$rvm_path/scripts/base"
 
 source "$rvm_path/scripts/patches"
 
-lookup_patchset() {
+lookup_patchset()
+{
 
   local paths lookup_path
 
@@ -31,7 +32,8 @@ lookup_patchset() {
 }
 
 # Return the full patch for a given patch.
-__rvm_lookup_full_patch_path() {
+__rvm_lookup_full_patch_path()
+{
 
   local directory directories extension patch_path
 
@@ -56,7 +58,8 @@ __rvm_lookup_full_patch_path() {
   return 1
 }
 
-usage() {
+usage()
+{
   printf "
 
   Usage:

data/scripts/repair

@@ -2,7 +2,8 @@
 
 source "$rvm_path/scripts/base"
 
-usage() {
+usage()
+{
   printf "
   Usage:
 
@@ -13,13 +14,41 @@ usage() {
     symlinks     - Repair symlinks
     environments - Repair environments
     archives     - Repair archives
+    gemsets      - Repair gemsets
     all          - Repair all of the above
 
 "
 }
 
-repair_wrappers() {
+repair_gemsets()
+{
+  local directory directories
 
+  "$rvm_path/scripts/log" "info" \
+    "Removing gemsets missing names or interpreters."
+
+  (
+    builtin cd "${rvm_gems_path:-"rvm_path/gems"}"
+
+    directories=(
+      $( find . -mindepth 1 -maxdepth 1 -type d | grep '@$' )
+      $( find . -mindepth 1 -maxdepth 1 -type d | grep '^./@')
+    )
+
+    for directory in "${directories[@]//.\/}" ; do
+
+      rm -rf "./$directory/"
+
+    done
+  )
+
+  "$rvm_path/scripts/log" "info" "Gemsets repaired."
+
+  return 0
+}
+
+repair_wrappers()
+{
   local wrapper_ruby_name
 
   "$rvm_path/scripts/log" "info" "Regenerating all wrappers..."
@@ -36,12 +65,13 @@ repair_wrappers() {
 
   "$rvm_path/scripts/log" "info" "Wrappers regenerated"
 
+  return 0
 }
 
 # Removes stale symlinks in $rvm_bin_path, likely
 # related to wrappers.
-repair_symlinks() {
-
+repair_symlinks()
+{
   "$rvm_path/scripts/log" "info" "Repairing symlinks..."
 
   (
@@ -49,7 +79,10 @@ repair_symlinks() {
 
     for executable_name in $(\find \. -type l); do
 
-      [[ -e "$executable_name" || "$(readlink "$executable_name")" != "$rvm_path/wrappers/"* ]] && continue
+      if [[ -e "$executable_name" \
+        || "$(readlink "$executable_name")" != "$rvm_path/wrappers/"* ]] ; then
+        continue
+      fi
 
       if [[ -f "$executable_name" ]]  ; then
 
@@ -66,12 +99,13 @@ repair_symlinks() {
 }
 
 # Regenerates each symlink file.
-repair_environments() {
+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))
+  environments=($(builtin cd "$rvm_path/environments" ; find . -maxdepth 1 -mindepth 1 -type f))
 
   for environment_name in "${environments[@]//.\/}" ; do
 
@@ -98,12 +132,13 @@ repair_environments() {
 }
 
 # Removes archives that have incorrect md5 sums.
-repair_archives() {
-
+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))
+  archives=($(builtin cd "${rvm_archives_path:-"$rvm_path/archives"}" ; find . -maxdepth 1 -mindepth 1 -type f))
 
   for archive_file in "${archives[@]//.\/}" ; do
 
@@ -127,8 +162,8 @@ repair_archives() {
   return 0
 }
 
-repair_all() {
-
+repair_all()
+{
   repair_symlinks
 
   repair_archives
@@ -153,6 +188,7 @@ fi
 case "$action" in
   all)          repair_all          ;;
   symlinks)     repair_symlinks     ;;
+  gemsets)      repair_gemsets      ;;
   environments) repair_environments ;;
   archives)     repair_archives     ;;
   wrappers)     repair_wrappers     ;;

data/scripts/rubygems

@@ -6,8 +6,8 @@ result=0
 
 __rvm_become
 
-rubygems_setup() {
-
+rubygems_setup()
+{
   __rvm_warn_on_rubyopt
 
   unset RUBYOPT
@@ -45,6 +45,7 @@ rubygems_setup() {
     fi
 
     "$rvm_path/scripts/log" "info" "Installing rubygems dedicated to $rvm_ruby_string..."
+
     rvm_rubygems_version="$version"
     rvm_gem_package_name="rubygems-$rvm_rubygems_version"
     rvm_rubygems_url=$(__rvm_db "rubygems_${rvm_rubygems_version}_url")

data/scripts/rvm-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