rvm 1.0.6 → 1.0.7

data/scripts/migrate

@@ -2,7 +2,7 @@
 
 unset GREP_OPTIONS
 
-source "$rvm_scripts_path/base"
+source "$rvm_path/scripts/base"
 
 usage() {
   echo "Usage: rvm migrate from to" >&2
@@ -20,12 +20,12 @@ confirm() {
 }
 
 die_with_error() {
-  "$rvm_scripts_path/log" "fail" "$1"
+  "$rvm_path/scripts/log" "fail" "$1"
   exit "${2:-1}"
 }
 
 expand_ruby_name() {
-  "$rvm_scripts_path/tools" strings "$1" | awk -F"$rvm_gemset_separator" '{print $1}'
+  "$rvm_path/scripts/tools" strings "$1" | awk -F"${rvm_gemset_separator:-"@"}" '{print $1}'
 }
 
 migrate_rubies() {
@@ -57,14 +57,14 @@ migrate_rubies() {
   echo "Moving gemsets..."
 
   while read -r origin_gemset; do
-    [[ "$origin_gemset" = "$expanded_source" || "$origin_gemset" = "$expanded_source$rvm_gemset_separator"* ]] || continue
+    [[ "$origin_gemset" = "$expanded_source" || "$origin_gemset" = "${expanded_source}${rvm_gemset_separator:-"@"}"* ]] || continue
 
-    gemset_name="${origin_gemset/*${rvm_gemset_separator}/}"
+    gemset_name="${origin_gemset/*${rvm_gemset_separator:-"@"}/}"
 
     destination_gemset="$expanded_destination"
 
     if [[ -n "$gemset_name" ]]; then
-      destination_gemset="$destination_gemset$rvm_gemset_separator$gemset_name"
+      destination_gemset="${destination_gemset}${rvm_gemset_separator:-"@"}${gemset_name}"
     fi
 
     echo "Moving $origin_gemset to $destination_gemset"
@@ -83,7 +83,7 @@ migrate_rubies() {
 
     __rvm_run_with_env "gemset.pristine" "$destination_gemset" "rvm gemset pristine"
 
-  done < <("$rvm_scripts_path/list" gemsets strings | \grep "^$expanded_source")
+  done < <("$rvm_path/scripts/list" gemsets strings | \grep "^$expanded_source")
 
 
   if confirm 'Do you wish to move over aliases?' ; then
@@ -94,15 +94,15 @@ migrate_rubies() {
 
       migrate_alias_name="${alias_pair/=*/}"
 
-      if [[ "$migrate_ruby_name" = "$expanded_source" || "$migrate_ruby_name" = "$expanded_source$rvm_gemset_separator"* ]]; then
+      if [[ "$migrate_ruby_name" = "$expanded_source" || "$migrate_ruby_name" = "${expanded_source}${rvm_gemset_separator:-"@"}"* ]]; then
 
         migrate_new_alias_name="${migrate_ruby_name/$expanded_source/$expanded_destination}"
 
         echo "Updating alias $migrate_alias_name to point to $migrate_new_alias_name"
 
-        "$rvm_scripts_path/alias" delete "$migrate_alias_name" >/dev/null 2>&1
+        "$rvm_path/scripts/alias" delete "$migrate_alias_name" >/dev/null 2>&1
 
-        "$rvm_scripts_path/alias" create "$migrate_alias_name" "$migrate_new_alias_name" >/dev/null 2>&1
+        "$rvm_path/scripts/alias" create "$migrate_alias_name" "$migrate_new_alias_name" >/dev/null 2>&1
       fi
 
     done < "$rvm_config_path/alias"
@@ -113,9 +113,9 @@ migrate_rubies() {
 
     origin_wrappers_path="$rvm_wrappers_path/$expanded_source"
 
-    binaries=($(cd "$rvm_bin_path" ; find * -type f -maxdepth 0))
+    binaries=($(cd "$rvm_bin_path" ; find . -maxdepth 1 -mindepth 1 -type f))
 
-    for binary_name in "${binaries[@]}" ; do
+    for binary_name in "${binaries[@]//.\/}" ; do
 
       full_bin_path="$rvm_bin_path/$binary_name"
 

data/scripts/monitor

@@ -3,7 +3,7 @@
 original_ruby_strings=$rvm_ruby_strings
 original_ruby_string=$rvm_ruby_string
 
-source "$rvm_scripts_path/base"
+source "$rvm_path/scripts/base"
 
 rvm_monitor_sleep="${rvm_monitor_sleep:-2}"
 
@@ -58,11 +58,11 @@ while : ; do
         if [[ "spec" = "$framework" ]] ; then
           rvm_action="spec"
           rvm_ruby_args="spec/spec_helper.rb ${changed_spec_files[*]}"
-          "$rvm_scripts_path/set" $rvm_action $rvm_ruby_args
+          "$rvm_path/scripts/set" $rvm_action $rvm_ruby_args
         elif [[ "test" = "$framework" ]] ; then
           rvm_action="ruby"
           rvm_ruby_args=" -r$(echo "${changed_test_files[*]}" | sed 's/ / -r/g') test/test_helper.rb"
-          "$rvm_scripts_path/set" $rvm_action $rvm_ruby_args
+          "$rvm_path/scripts/set" $rvm_action $rvm_ruby_args
         fi
         update=1
       fi
@@ -73,11 +73,11 @@ while : ; do
         if [[ "spec" = "$framework" ]] ; then
           rvm_action="spec"
           rvm_ruby_args="spec/"
-          "$rvm_scripts_path/set" $rvm_action $rvm_ruby_args
+          "$rvm_path/scripts/set" $rvm_action $rvm_ruby_args
         elif [[ "test" = "$framework" ]] ; then
           rvm_action="rake"
           rvm_ruby_args="test"
-          "$rvm_scripts_path/set" "$rvm_action" $rvm_ruby_args
+          "$rvm_path/scripts/set" "$rvm_action" $rvm_ruby_args
         fi
         update=1
       fi

data/scripts/notes

@@ -19,7 +19,7 @@ if [[ "Linux" = "$system" ]] ; then
 # git is required.
 # patch is required (for ree, some ruby head's).
 # If you wish to install rbx and/or any MRI head (eg. 1.9.2-head) then you must install and use rvm 1.8.7 first.
-# If you wish to have the 'pretty colors' again, set 'export rvm_pretty_print=1' in ~/.rvmrc.
+# If you wish to have the 'pretty colors' again, set 'export rvm_pretty_print_flag=1' in ~/.rvmrc.
 "
 
   if [[ ! -z "$rvm_aptitude_binary" ]] ; then

data/scripts/package

@@ -3,7 +3,7 @@
 if [[ "$rvm_trace_flag" -eq 2 ]] ; then set -x ; export rvm_trace_flag ; fi
 
 rvm_base_except="selector"
-source "$rvm_scripts_path/base"
+source "$rvm_path/scripts/base"
 
 # Tools to make managing ruby dependencies inside of rvm easier.
 args=($*)
@@ -20,18 +20,18 @@ install_package() {
   (
     builtin cd "$rvm_src_path"
 
-    "$rvm_scripts_path/log" "info" "Fetching $package-$version.$archive_format to $rvm_archives_path"
+    "$rvm_path/scripts/log" "info" "Fetching $package-$version.$archive_format to $rvm_archives_path"
 
     if [[ "$archive_format" = "tar.gz" ]] || [[ "$archive_format" = "tgz" ]] ; then
-      "$rvm_scripts_path/fetch" "$package_url/$package-$version.$archive_format" || (result=$? && return $result)
+      "$rvm_path/scripts/fetch" "$package_url/$package-$version.$archive_format" || (result=$? && return $result)
       __rvm_run "$package/extract" "tar zxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format to $rvm_src_path"
 
     elif [[ "$archive_format" = "tar.bz2" ]] ; then
-      "$rvm_scripts_path/fetch" "$package_url/$package-$version.$archive_format" || (result=$? && return $result)
+      "$rvm_path/scripts/fetch" "$package_url/$package-$version.$archive_format" || (result=$? && return $result)
       __rvm_run "$package/extract" "tar jxf $rvm_archives_path/$package-$version.$archive_format -C $rvm_src_path" "Extracting $package-$version.$archive_format to $rvm_src_path"
 
     elif [[ "$archive_format" = "zip" ]] ; then
-      "$rvm_scripts_path/fetch" "$package_url/$package-$version.$archive_format" || (result=$? && return $result)
+      "$rvm_path/scripts/fetch" "$package_url/$package-$version.$archive_format" || (result=$? && return $result)
       __rvm_run "$package/extract" "unzip -q -o $rvm_archives_path/$package-$version.$archive_format -d $rvm_src_path/$package-$version" "Extracting $package-$version.$archive_format to $rvm_src_path"
 
     else
@@ -53,7 +53,7 @@ install_package() {
     fi
 
     \touch "$rvm_config_path/packages"
-    "$rvm_scripts_path/db" "$rvm_config_path/packages" "${package}" "${version}"
+    "$rvm_path/scripts/db" "$rvm_config_path/packages" "${package}" "${version}"
   )
 }
 
@@ -81,11 +81,11 @@ openssl() {
 
     if [[ ! -z "$rvm_archflags" ]]; then
 
-      if "$rvm_scripts_path/match" "$rvm_archflags" "64"; then
+      if "$rvm_path/scripts/match" "$rvm_archflags" "64"; then
         hw_cpu64bit=1
       fi
 
-      if "$rvm_scripts_path/match" "$rvm_archflags" "ppc"; then
+      if "$rvm_path/scripts/match" "$rvm_archflags" "ppc"; then
         hw_machine="Power Macintosh"
       fi
     else
@@ -109,7 +109,9 @@ openssl() {
       fi
     fi
     configure_command="./Configure"
-    patches="$rvm_patches_path/$package/Makefile.org.patch,$rvm_patches_path/$package/crypto-Makefile.patch"
+
+    patches="$rvm_path/patches/$package/Makefile.org.patch,$rvm_patch/patches/$package/crypto-Makefile.patch"
+
     # Don't use -j option for make OpenSSL
     if [[ ! -z "$rvm_make_flags" ]] ; then
       rvm_make_flags=$(echo "$rvm_make_flags" | sed -e "s/-j[[:space:]]*[[0-9]]*//")
@@ -192,16 +194,20 @@ llvm() {
 }
 
 if [[ -n "$library" ]] ; then
+
   case $library in
     readline|iconv|curl|openssl|zlib|autoconf|ncurses|pkgconfig|gettext|glib|mono|llvm|libxml2)
       ${library}
     ;;
     *)
-      "$rvm_scripts_path/log" "error" "Package '${library}' is unknown."
+      "$rvm_path/scripts/log" "error" "Package '${library}' is unknown."
     ;;
   esac
+
+  exit $?
+
 else
-  "$rvm_scripts_path/log" "info" "Usage: 'rvm package {install,uninstall} {readline,iconv,curl,openssl,zlib,autoconf,ncurses,pkgconfig,gettext,glib,mono,llvm,libxml2}'"
+  "$rvm_path/scripts/log" "info" \
+    "Usage: 'rvm package {install,uninstall} {readline,iconv,curl,openssl,zlib,autoconf,ncurses,pkgconfig,gettext,glib,mono,llvm,libxml2}'"
   exit 1
 fi
-

data/scripts/patches

@@ -6,9 +6,14 @@
 # Returns the path used to look for a patch given a specific name.
 __rvm_patch_lookup_path() {
   echo "/"
+
   [[ -n "${rvm_patch_original_pwd:-""}" ]] && echo "$rvm_patch_original_pwd/"
+
   echo "$PWD/"
-  __rvm_ruby_string_paths_under "$rvm_patches_path" | sed 's/$/\//'
+
+  __rvm_ruby_string_paths_under "$rvm_path/patches" | sed 's/$/\//'
+
+  return $?
 }
 
 __rvm_expand_patch_name() {
@@ -18,7 +23,7 @@ __rvm_expand_patch_name() {
 
   [[ -z "$name" ]] && return 0
 
-  expanded_patch_name="$("$rvm_scripts_path/patchsets" show "$name")"
+  expanded_patch_name="$("$rvm_path/scripts/patchsets" show "$name")"
 
   if [[ "$?" == "0" ]]; then
     echo "${expanded_patch_name}"
@@ -52,5 +57,5 @@ __rvm_lookup_full_patch_path() {
 
   done
 
-  return 1
+  return 0
 }

data/scripts/patchsets

@@ -1,41 +1,73 @@
 #!/usr/bin/env bash
 
 rvm_base_except="selector"
-source "$rvm_scripts_path/base"
-source "$rvm_scripts_path/patches"
+
+source "$rvm_path/scripts/base"
+
+source "$rvm_path/scripts/patches"
 
 lookup_patchset() {
+
+  local paths lookup_path
+
   if [[ -z "$1" ]]; then
     echo "Usage: rvm patchset show name"
     return 1
   fi
-  for lookup_path in $(__rvm_ruby_string_paths_under "$rvm_patchsets_path") ; do
+
+  paths=($(__rvm_ruby_string_paths_under "$rvm_path/patchsets"))
+
+  for lookup_path in "${paths[@]}" ; do
+
     if [[ -s "$lookup_path/$1" ]]; then
+
       cat "$lookup_path/$1"
-      return
+
+      return 0
     fi
-  done; unset lookup_path
+  done
+
   return 1
 }
 
 # Return the full patch for a given patch.
 __rvm_lookup_full_patch_path() {
+
+  local directory directories extension patch_path
+
+  directories=($(__rvm_patch_lookup_path))
+
   # Absolute path, pwd and then finally the rvm patches path.
-  for directory in $(__rvm_patch_lookup_path) ; do
+  for directory in "${directories[@]}" ; do
+
     for extension in {"",.patch,.diff}; do
+
       patch_path="${directory}${1}${extension}"
+
       if [[ -s "$patch_path" ]]; then
         echo "$patch_path"
         return
       fi
-    done; unset extension patch_path
-  done; unset directory
+
+    done
+
+  done
+
   return 1
 }
 
 usage() {
-  echo "Usage: 'rvm patchset {show,lookup} [patchset]'"
-  echo "        Tools for manipulating patchsets."
+  printf "
+
+  Usage:
+
+    rvm patchset {show,lookup} [patchset]
+
+  Description:
+
+    Tools for manipulating patchsets.
+
+"
   return 1
 }
 

data/scripts/repair

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-source "$rvm_scripts_path/base"
+source "$rvm_path/scripts/base"
 
 usage() {
   echo "Usage: rvm repair {symlinks,environments,archives,all}" >&2
@@ -15,7 +15,7 @@ repair_symlinks() {
     for executable_name in $(\find \. -type l); do
       [[ -e "$executable_name" || "$(readlink "$executable_name")" != "$rvm_wrappers_path/"* ]] && continue
       if [[ -f "$executable_name" ]]  ; then
-        "$rvm_scripts_path/log" "info" \
+        "$rvm_path/scripts/log" "info" \
           "Removing stale symlink from $(basename "$executable_name")"
         \rm -f "$executable_name"
       fi
@@ -27,19 +27,19 @@ repair_symlinks() {
 repair_environments() {
   local environment_name environments
 
-  environments=($(cd "$rvm_environments_path" ; find * -type f -maxdepth 0))
+  environments=($(cd "$rvm_environments_path" ; find . -maxdepth 1 -mindepth 1 -type f))
 
-  for environment_name in "${environments[@]}" ; do
+  for environment_name in "${environments[@]//.\/}" ; do
 
     [[ -L "$rvm_environments_path/$environment_name" ]] && continue
 
-    "$rvm_scripts_path/log" "info" \
+    "$rvm_path/scripts/log" "info" \
       "Regenerating environment file for '$environment_name'"
 
     [[ -f "$rvm_environments_path/$environment_name" ]] && \rm -f "$rvm_environments_path/$environment_name"
 
     (
-    source "$rvm_scripts_path/base"
+    source "$rvm_path/scripts/base"
 
     __rvm_become "$environment_name"
 
@@ -54,19 +54,19 @@ repair_archives() {
 
   local archive_file archives stored_md5sum
 
-  archives=($(cd "$rvm_archives_path" ; find * -type f -maxdepth 0))
+  archives=($(cd "$rvm_archives_path" ; find . -maxdepth 1 -mindepth 1 -type f))
 
-  for archive_file in "${archives[@]}" ; do
+  for archive_file in "${archives[@]//.\/}" ; do
 
     [[ -f "$rvm_archives_path/$archive_file" ]] || continue
 
-    stored_md5sum="$($rvm_scripts_path/db "$rvm_config_path/md5" "$archive_file" | head -n1)"
+    stored_md5sum="$($rvm_path/scripts/db "$rvm_config_path/md5" "$archive_file" | head -n1)"
 
     if [[ -n "$stored_md5sum" ]] ; then
 
-      if [[ ! "$rvm_scripts_path/md5" "$rvm_archives_path/$archive_file" "$stored_md5sum" ]] ; then
+      if [[ ! "$rvm_path/scripts/md5" "$rvm_archives_path/$archive_file" "$stored_md5sum" ]] ; then
 
-        "$rvm_scripts_path/log" "info" "Removing archive for '$archive_file' - Incorrect md5 checksum."
+        "$rvm_path/scripts/log" "info" "Removing archive for '$archive_file' - Incorrect md5 checksum."
 
         rm -rf "$rvm_archives_path/$archive_file"
       fi
@@ -84,7 +84,7 @@ repair_all() {
 
   repair_environments
 
-  "$rvm_scripts_path/log" "info" \
+  "$rvm_path/scripts/log" "info" \
     "symlinks, archives and environments have been repaired."
 
   return 0

data/scripts/rubygems

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-source "$rvm_scripts_path/base"
+source "$rvm_path/scripts/base"
 
 result=0
 
@@ -20,17 +20,17 @@ rubygems_setup() {
   fi
 
   if [[ "$install" -eq 0 ]] ; then
-    "$rvm_scripts_path/log" "error" "Cannot switch to ${version} for this interpreter."
+    "$rvm_path/scripts/log" "error" "Cannot switch to ${version} for this interpreter."
     exit 1
   else
-    "$rvm_scripts_path/log" "info" "Removing old Rubygems files..."
+    "$rvm_path/scripts/log" "info" "Removing old Rubygems files..."
     rubygems_dir="$(ruby -rrbconfig -e "puts Config::CONFIG.values_at('sitelibdir','vendorlibdir').detect {|path| File.directory?(File.join(path, 'rubygems')) }.to_s")"
     if [[ -n "$rubygems_dir" && -d "$rubygems_dir" ]]; then
       # Remove common files installed by ruby gems.
       \rm -rf "${rubygems_dir}/ubygems.rb" "${rubygems_dir}/rubygems.rb" "${rubygems_dir}/rubygems" "${rubygems_dir}/gauntlet_rubygems.rb"
     fi
 
-    "$rvm_scripts_path/log" "info" "Installing rubygems dedicated to $rvm_ruby_string..."
+    "$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")
@@ -43,10 +43,10 @@ rubygems_setup() {
     fi
 
     if [[ ! -d "$rvm_src_path/$rvm_gem_package_name" ]] ; then
-      "$rvm_scripts_path/log" "info" "Retrieving $rvm_gem_package_name"
-      "$rvm_scripts_path/fetch" "$rvm_gem_url"
+      "$rvm_path/scripts/log" "info" "Retrieving $rvm_gem_package_name"
+      "$rvm_path/scripts/fetch" "$rvm_gem_url"
       result=$? ; if [[ "$result" -gt 0 ]] ; then
-        "$rvm_scripts_path/log" "error" "There has been an error while trying to fetch the source. Aborting the installation." ; return $result
+        "$rvm_path/scripts/log" "error" "There has been an error while trying to fetch the source. Aborting the installation." ; return $result
       fi
       \mkdir -p "$rvm_src_path/$rvm_gem_package_name"
       __rvm_run "rubygems.extract" "gunzip < $rvm_archives_path/$rvm_gem_package_name.tgz | tar xf - -C $rvm_src_path" "Extracting $rvm_gem_package_name ..."
@@ -57,9 +57,9 @@ rubygems_setup() {
     __rvm_run "rubygems.install" "GEM_PATH=$rvm_ruby_gem_path GEM_HOME=$rvm_ruby_gem_home BUNDLE_PATH=$rvm_ruby_gem_home $rvm_ruby_home/bin/ruby $rvm_src_path/$rvm_gem_package_name/setup.rb" "Installing rubygems for $rvm_ruby_home/bin/ruby"
     result=$?
     if [[ "$result" == 0 ]] ; then
-      "$rvm_scripts_path/log" "info" "Installation of rubygems completed successfully."
+      "$rvm_path/scripts/log" "info" "Installation of rubygems completed successfully."
     else
-      "$rvm_scripts_path/log" "warning" "Installation of rubygems did not complete successfully."
+      "$rvm_path/scripts/log" "warning" "Installation of rubygems did not complete successfully."
     fi
 
     if [[ ! -z "$rvm_ruby_major_version" ]] ; then
@@ -80,7 +80,7 @@ rubygems_setup() {
 }
 
 if ! command -v ruby > /dev/null ; then
-  "$rvm_scripts_path/log" "error" "'ruby' was not found, cannot install rubygems unless ruby is present (Do you have an RVM ruby installed & selected?)"
+  "$rvm_path/scripts/log" "error" "'ruby' was not found, cannot install rubygems unless ruby is present (Do you have an RVM ruby installed & selected?)"
   exit 1
 fi
 
@@ -92,7 +92,7 @@ version="${args[0]}"
 args="$(echo ${args[@]:1}) " # Strip trailing / leading / extra spacing.
 
 if [[ -z "$version" ]] ; then
-  "$rvm_scripts_path/log" "error" "A version must be specified, for example 'rvm rubygems 1.3.7'"
+  "$rvm_path/scripts/log" "error" "A version must be specified, for example 'rvm rubygems 1.3.7'"
   exit 1
 fi