rvm 0.0.49 → 0.0.50

data/examples/rvmrc

@@ -17,16 +17,16 @@
 #rvm_prefix_path="$HOME/."
 
 # Default Install Path
-#rvm_install_path="${rvm_prefix_path}rvm"
+#rvm_path="${rvm_prefix_path}rvm"
 
 # Default Archives Path
-#rvm_archive_path="${rvm_install_path}/archives"
+#rvm_archives_path="${rvm_path}/archives"
 
 # Default Source Path
-#rvm_source_path="${rvm_install_path}/src"
+#rvm_source_path="${rvm_path}/src"
 
 # Default Log Path
-#rvm_log_path="${rvm_install_path}/log"
+#rvm_log_path="${rvm_path}/log"
 
 # Default gems directory
 # rvm_gem_path="$HOME/.gem"

data/lib/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 0
 :minor: 0
-:patch: 49
+:patch: 50

data/rvm.gemspec

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

data/scripts/cli

@@ -107,7 +107,7 @@ function __rvm_parse-args {
   while [ $# -gt 0 ] ; do
     rvm_token="$1" ; shift
     case "$rvm_token" in
-      install|uninstall|path|info|setup|version|srcdir|list|reset|debug|reload|implode|update|readline|iconv|use|gemsync)
+      install|uninstall|path|info|setup|version|srcdir|list|reset|debug|reload|implode|update|readline|iconv|use|gemsync|gemset)
         rvm_action=$rvm_token
       ;;
 
@@ -140,6 +140,22 @@ function __rvm_parse-args {
         rvm_ruby_interpreter="${rvm_ruby_interpreter:-current}"
       ;;
 
+      --load|load|dump)
+        eval "rvm_${rvm_token}_flag=1"
+        if [ ! -z "$1" ] ; then
+          if [ ! -z "$(echo $1 | awk '/\.gemset$/')" ] ; then
+            rvm_gem_set_name=$(echo $1 | sed 's/\.gemset//')
+          else
+            rvm_gem_set_name=$1
+          fi
+          shift
+        else
+          rvm_gem_set_name="default"
+        fi
+        rvm_file_name="$rvm_gem_set_name.gemset"
+        rvm_action=$rvm_token
+      ;;
+
       gemdup)
         rvm_action=$rvm_token
         if [ -z "$1" ] ; then
@@ -297,18 +313,6 @@ function __rvm_parse-args {
         rvm_parse_break=1
       ;;
 
-      --load)
-        rvm_load_flag=1
-        if [ ! -z "$1" ] ; then
-          rvm_load_file="$1"
-          shift
-        else
-           rvm_action="error"
-           rvm_error_message="--load must be followed by the .gemset file to load."
-           break;
-        fi
-      ;;
-
       default|system)
         rvm_action="use"
         rvm_ruby_interpreter="system"
@@ -383,9 +387,9 @@ function rvm {
   result=0
   case "$rvm_action" in
     use)        __rvm_use              ; result=$? ;;
-    gemdir)     __rvm_gem-dir          ; result=$? ;;
-    gemdup)     __rvm_gem-dup          ; result=$? ;;
-    srcdir)     __rvm_src-dir          ; result=$? ;;
+    gemdir)     __rvm_gemdir           ; result=$? ;;
+    gemdup)     __rvm_gemdup           ; result=$? ;;
+    srcdir)     __rvm_source_dir       ; result=$? ;;
     list)       __rvm_list             ; result=$? ;;
     version)    __rvm_version          ; result=$? ;;
     reset)      __rvm_reset            ; result=$? ;;
@@ -406,6 +410,10 @@ function rvm {
       result=$?
     ;;
 
+    load|dump)
+      __rvm_gemset_${rvm_action}
+    ;;
+
     gemsync)
       rvm_source_gem_path=`__rvm_select ; echo $rvm_gem_home`
       __rvm_gem_sync

data/scripts/ruby-installer

@@ -76,40 +76,36 @@ function __rvm_install_source {
     rvm_autoconf=`which autoconf`
     if [ $? -gt 0 ] ; then __rvm_log "fail" "rvm expects autoconf" ; result=$? ; return $result ; fi
     __rvm_run "autoconf" "$rvm_autoconf"
-    if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
+    # if [ $? -gt 0 ] ; then result=$? ; return $result ; fi # Don't barf on autoconf fail...
   fi
 
   if [ -s ./Makefile -a -z "$rvm_reconfigure_flag" ] ; then
-    __rvm_log "warn" "Skipping configure step, Makefile exists so configure must have already been run."
+    __rvm_log "debug" "Skipping configure step, Makefile exists so configure must have already been run."
   elif [ -s ./configure ] ; then
     __rvm_log "info" "Configuring $rvm_ruby_package_name using $rvm_ruby_configure, this may take a while depending on your cpu(s)..."
     if [ -d $rvm_path/usr/include/readline/ ] ; then
-      configure_parameters="$configure_parameters --with-readline-dir=$rvm_path/usr/include/readline/"
+      configure_parameters="$configure_parameters --with-readline-dir=$rvm_path/usr/include/readline/ --with-search-path=$rvm_path/usr"
     fi
     if [ -d $rvm_path/usr/include/iconv/ ] ; then
-      configure_parameters="$configure_parameters --with-iconv-dir=$rvm_path/usr/include/iconv/"
+      configure_parameters="$configure_parameters --with-iconv-dir=$rvm_path/usr/include/iconv/ --with-search-path=$rvm_path/usr"
     fi
-    __rvm_run "configure" "./configure --prefix=$rvm_ruby_home $rvm_ruby_configure $configure_parameters"
-    unset configure_parameters
+    __rvm_run "configure" "./configure --prefix=$rvm_ruby_home $rvm_ruby_configure $configure_parameters --with-search-path=/usr --with-search-path=/usr/local"
     if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
+    unset configure_parameters
+  elif [ ! -z "rvm_ruby_configure" ] ; then
+    $rvm_ruby_configure
   else
     __rvm_log "error" "Skipping configure step, 'configure' script does not exist, did autoconf not run successfully?"
   fi
 
   __rvm_log "info" "Compiling $rvm_ruby_package_name, this may take a while, depending on your cpu(s)..."
-  if [ -z "$rvm_ruby_make" ] ; then
-    __rvm_run "make" "/usr/bin/make $rvm_make_flags"
-  else
-    __rvm_run "make" "$rvm_ruby_make $rvm_make_flags"
-  fi
+  rvm_ruby_make=${rvm_ruby_make:-"/usr/bin/make"}
+  __rvm_run "make" "$rvm_ruby_make $rvm_make_flags"
   if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
 
-  if [ -z "$rvm_ruby_make" ] ; then
-    __rvm_log "info" "Installing $rvm_ruby_package_name"
-    __rvm_run "install" "/usr/bin/make install"
-  else
-    __rvm_run "install" "$rvm_ruby_make_install"
-  fi
+  __rvm_log "info" "Installing $rvm_ruby_package_name"
+  rvm_ruby_make_install=${rvm_ruby_make_install:-"/usr/bin/make install"}
+  __rvm_run "install" "$rvm_ruby_make_install"
   if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
 
   __rvm_log "info" "Installation of $rvm_ruby_package_name is complete."
@@ -131,16 +127,21 @@ function __rvm_install_ruby {
   if [ "`uname`" = "Darwin" ] ; then ARCHFLAGS="-arch x86_64 -arch i386" ; export ARCHFLAGS ; fi
 
   case "$rvm_ruby_interpreter" in
-
     macruby)
       if [ "`uname`" = "Darwin" ] ; then
+        rvm_ruby_interpreter="system"
+        __rvm_select
+        __rvm_use
+        rvm_ruby_interpreter="macruby"
+        __rvm_gi "rake" # Make sure that rake is present
         #rvm_macruby_repo_url="${rvm_macruby_repo_url:-"http://svn.macosforge.org/repository/ruby/MacRuby"}"
         rvm_macruby_repo_url="${rvm_macruby_repo_url:-"git://github.com/masterkain/macruby.git"}"
         rvm_ruby_repo_url=$rvm_macruby_repo_url
         #rvm_macruby_nightly_url=`__rvm_db "macruby_nightly_url"`
-        rvm_ruby_configure=""
-        rvm_ruby_make="rake macruby:build framework_instdir=$rvm_path/macruby-head framework_name=/macruby-head --trace"
-        rvm_ruby_make_install="rake framework:install framework_instdir=$rvm_path/macruby-head framework_name=/macruby-head --trace"
+        rvm_ruby_configure=" "
+        rvm_make_flags=" "
+        rvm_ruby_make="cd $rvm_ruby_src_path; /usr/bin/rake macruby:build framework_instdir=$rvm_path/macruby-head framework_name=/macruby-head --trace"
+        rvm_ruby_make_install="cd $rvm_ruby_src_path; /usr/bin/rake framework:install"
         rvm_ruby_rev="${rvm_ruby_rev:-head}" # Hard coding this for now
         rvm_url=$rvm_ruby_repo_url
 
@@ -224,7 +225,7 @@ function __rvm_install_ruby {
       PATH=$rvm_bin_path:$PATH ; export PATH
 
       rvm_ruby_repo_url=$rvm_rubinius_repo_url
-      rvm_ruby_configure=""
+      rvm_ruby_configure=" "
       rvm_ruby_src_path=$rvm_ruby_home
       rvm_ruby_make="rake"
       rvm_ruby_make_install="rake install"
@@ -345,17 +346,24 @@ RubyWrapper
     ;;
 
     ruby)
-        # Merge configure options with user specified options
-        rvm_ruby_configure="--enable-shared --enable-pthread $rvm_ruby_configure "
-        if [ "`uname`" = "Darwin" ] ; then ARCHFLAGS="-arch x86_64 -arch i386" ; export ARCHFLAGS ; fi
+      if [ "`uname`" = "Darwin" ] ; then
+        ARCHFLAGS="-arch x86_64 -arch i386" ; export ARCHFLAGS
+        if [ "$(echo $rvm_ruby_version | awk '/1\.8/')" ] ; then
+          rvm_ruby_configure="${rvm_ruby_configure:-"--enable-shared --disable-pthread"} "
+        else
+          rvm_ruby_configure="${rvm_ruby_configure:-"--enable-shared"} "
+        fi
+      else
+        rvm_ruby_configure="${rvm_ruby_configure:-"--enable-shared --enable-pthread"} "
+      fi
       __rvm_install_source $*
     ;;
 
     default)
-      __rvm_log "fail" "please specify a ruby implementation to install."
+      __rvm_log "fail" "must specify a ruby interpreter to install."
     ;;
 
-    *) __rvm_log "fail" "Ruby implementation '$rvm_ruby_interpreter' is not known."
+    *) __rvm_log "fail" "Ruby interpreter '$rvm_ruby_interpreter' is not known."
 
   esac
 
@@ -389,7 +397,7 @@ function __rvm_manage_rubies {
         fi
       done < <(/bin/ls $rvm_path/*/bin/ruby 2> /dev/null)
     else
-      __rvm_log "warn" "Really? Install all? See 'rvm list --all' and limit the selection to something more sane please :)"
+      __rvm_log "warn" 'Really? Install all? See "rvm list --all" and limit the selection to something more sane please :)'
     fi
   fi
   __rvm_state

data/scripts/selector

@@ -54,7 +54,7 @@ function __rvm_select {
     jruby)
       rvm_ruby_version="${rvm_ruby_version:-`__rvm_db "jruby_version"`}"
       unset rvm_ruby_patch_level
-      if [ ! -z "$(echo $rvm_ruby_version | awk '/^1\.2\.0/')" -o ! -z "$(rvm_ruby_version | awk '/^1\.3\.[0-3]/')" ] ; then
+      if [ -z "$(echo $rvm_ruby_version | awk '/^1\.2\.0/')" -a -z "$(echo $rvm_ruby_version | awk '/^1\.3\.[0-3]/')" ] ; then
         __rvm_log "fail" "Unknown jRuby version: $rvm_ruby_version"
       fi
       alias jruby_ng="jruby --ng"
@@ -90,8 +90,14 @@ function __rvm_select {
     default|system|current|user)
       #no-op?
     ;;
+
     *)
-      __rvm_log "fail" "Ruby implementation '$rvm_ruby_interpreter' is not known."
+      if [ ! -z "$MY_RUBY_HOME" ] ; then
+        rvm_ruby_string=$(basename $MY_RUBY_HOME)
+        __rvm_select
+      else
+        __rvm_log "fail" "Ruby implementation '$rvm_ruby_interpreter' is not known."
+      fi
   esac
 
   if [ ! -z "$rvm_ruby_rev" ] ; then
@@ -159,7 +165,7 @@ function __rvm_use {
       source $rvm_path/default
     else
       rvm_ruby_interpreter="system"
-      __rvm_log "error" "no default rvm specified, defaulting to pre-rvm sytem."
+      __rvm_log "warn" "no default rvm specified, defaulting to pre-rvm sytem."
       unset GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION IRBRC
       if [ -s $rvm_path/system ] ; then source $rvm_path/system ; fi
     fi

data/scripts/utility

@@ -54,7 +54,11 @@ function __rvm_debug {
 # Logging functions based on level
 function __rvm_log {
   case "$1" in
-    debug) shift ; echo -e "\033[0;35m<debug>\033[0m $* \033[0;35m</debug> \033[0m " ;;
+    debug) shift ;
+      if [ ! -z "$rvm_debug_flag" ] ; then
+        echo -e "\033[0;35m<debug>\033[0m $* \033[0;35m</debug> \033[0m "
+      fi
+    ;;
     info)  shift ; echo -e "\033[0;32m<info>\033[0m $* \033[0;32m</info> \033[0m " ;;
     warn)  shift ; echo -e "\033[0;33m<warning>\033[0m $* \033[0;33m</warning> \033[0m " ;;
     error) shift ; echo -e "\033[0;31m<error>\033[0m $* \033[0;31m</error> \033[0m " ;;
@@ -80,7 +84,7 @@ function __rvm_run {
   command="$*"
   rvm_ruby_log_path=${rvm_ruby_log_path:-$rvm_path/log}
   mkdir -p $rvm_ruby_log_path
-  if [ ! -z "$rvm_debug_flag" ] ; then __rvm_log "debug" "Executing: $command" ; fi
+  __rvm_log "debug" "Executing: $command"
   touch $rvm_ruby_log_path/$log_file_name.log $rvm_ruby_log_path/$log_file_name.error.log # for zsh :(
   echo "[$(date +'%Y-%m-%d %H:%M:%S')] $command" | tee $rvm_ruby_log_path/$log_file_name.log > $rvm_ruby_log_path/$log_file_name.error.log
   if [ -z "$rvm_niceness" -o "$rvm_niceness" = "0" ] ; then
@@ -226,7 +230,8 @@ function __rvm_reset {
   for file in system default ; do
     if [ -f $rvm_path/$file ] ; then rm -f $rvm_path/$file ; fi
   done
-  __rvm_select "system"
+  rvm_ruby_interpreter="system"
+  __rvm_select
 
   for system_config in system_ps1 system_ruby system_gem_path system_user_gem_path ; do
     __rvm_db "$system_config" "delete"
@@ -259,28 +264,26 @@ function __rvm_implode {
   done
 }
 
-function __rvm_gem-dir {
+function __rvm_gemdir {
   if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
   mkdir -p $rvm_gem_home
   echo $rvm_gem_home
 }
 
-function __rvm_src-dir {
-
+function __rvm_source_dir {
   if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
-
   if [ -z "$rvm_ruby_src_path" ] ; then
     __rvm_log "fail" "No source directory exists for the default implementation."
   else
     echo "$rvm_ruby_src_path"
   fi
-
 }
 
 # clones from source implementation/version to default
 # TODO: Merge this into 'rvm sync'
-function __rvm_gem-dup {
-    __rvm_log "debug" "$rvm_ruby_interpreter"
+function __rvm_gemdup {
+  if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
+  __rvm_log "debug" "$rvm_ruby_interpreter"
   if [ "$rvm_ruby_interpreter" = "default" ] ; then
     # TODO: ~/.rvm/default first, then system user
     rvm_source_gem_path="$rvm_system_user_gem_path"
@@ -341,22 +344,15 @@ function __rvm_db {
 function __rvm_list {
   if [ "$rvm_all_flag" ] ; then
     svn list http://svn.ruby-lang.org/repos/ruby/tags/ | grep 'v1_[8|9]' | sed 's/^v1_//' | sed 's/\/$//' | awk -F'_' '{print "1."$1"."$2 " -l "$3}' | sed 's/p$//'
-
-    echo "jruby 1.2.0"
-    echo "jruby 1.3.0"
-    echo "jruby 1.3.1"
-    echo "jruby head"
-    echo "rubinius head"
-    echo "rbx head"
-    echo "rbx head --jit"
-    echo "ree 20090610"
+    echo -e "jruby 1.2.0\njruby 1.3.0\njruby 1.3.1\njruby --head"
+    echo -e "rbx head (rubinius head)\nrbx head --jit"
+    echo -e "ree 20090610\nree --head\nree 1.8.7 --head"
   else
-    current=`which ruby | xargs dirname | xargs dirname | xargs basename 2> /dev/null`
-
+    current_ruby=`which ruby | xargs dirname | xargs dirname | xargs basename 2> /dev/null`
     echo -e "\nruby:\n"
     for version in `/bin/ls -l $rvm_path/ 2> /dev/null | awk '/ ruby-[1-2].*/ { print $NF  }'` ; do
-      string=`$rvm_bin_path/$version -v`
-      if [ "$current" = "$version" ] ; then
+      string=`$rvm_path/$version/bin/ruby -v`
+      if [ "$current_ruby" = "$version" ] ; then
         echo -e "=> $version : $string"
         selected="1"
       else
@@ -366,8 +362,8 @@ function __rvm_list {
 
     echo -e "\njruby:\n"
     for version in `/bin/ls -l $rvm_path/ 2> /dev/null | awk '/jruby-.*/ { print $NF }'` ; do
-      string=`$rvm_bin_path/$version -v`
-      if [ "$current" = "$version" ] ; then
+      string=`$rvm_path/$version/bin/ruby -v`
+      if [ "$current_ruby" = "$version" ] ; then
         echo -e "=> $version : $string"
         selected="1"
       else
@@ -377,8 +373,8 @@ function __rvm_list {
 
     echo -e "\nree:\n"
     for version in `/bin/ls $rvm_path/ 2> /dev/null | awk '/ruby-enterprise-.*/ { print $NF }'` ; do
-      string=`$rvm_bin_path/$version -v | tr "\n" ' ' `
-      if [ "$current" = "$version" ] ; then
+      string=`$rvm_path/$version/bin/ruby -v | tr "\n" ' ' `
+      if [ "$current_ruby" = "$version" ] ; then
         echo -e "=> $version : $string"
         selected="1"
       else
@@ -390,8 +386,8 @@ function __rvm_list {
       version=`grep '^MY_RUBY_HOME' ~/.rvm/default | awk -F"'" '{print $2}' | xargs basename`
       if [ ! -z "$version" ] ; then
         echo -e "\ndefault:\n"
-        string=`$rvm_bin_path/$version -v`
-        if [ "$current" = "$version" ] ; then
+        string=`$rvm_path/$version/bin/ruby -v`
+        if [ "$current_ruby" = "$version" ] ; then
           echo -e "=> $version : $string"
           selected="1"
         else
@@ -408,7 +404,7 @@ function __rvm_list {
       else
         echo -e "   $system_version\n"
       fi
-    fi ; unset current version selected
+    fi ; unset current_ruby version selected
   fi
 }
 
@@ -437,12 +433,13 @@ function __rvm_initialize {
   else
     rvm_path="${rvm_prefix_path}/rvm"
   fi
-  rvm_archives_path="${rvm_archives_path:-"${rvm_path}/archives"}"
-  rvm_source_path="${rvm_source_path:-"${rvm_path}/src"}"
-  rvm_log_path=${rvm_log_path:-"${rvm_path}/log"}
-  rvm_bin_path=${rvm_bin_path:-"${rvm_path}/bin"}
-  rvm_gem_path=${rvm_gem_path:-"${rvm_path}/gems"}
-  rvm_config_path=${rvm_config_path:-"${rvm_path}/config"}
+  rvm_archives_path="${rvm_archives_path:-"$rvm_path/archives"}"
+  rvm_source_path="${rvm_source_path:-"$rvm_path/src"}"
+  rvm_log_path=${rvm_log_path:-"$rvm_path/log"}
+  rvm_bin_path=${rvm_bin_path:-"$rvm_path/bin"}
+  rvm_gem_path=${rvm_gem_path:-"$rvm_path/gems"}
+  rvm_config_path=${rvm_config_path:-"$rvm_path/config"}
+  rvm_temp_path=${rvm_temp_path:-"$rvm_path/tmp"}
 
   rvm_ruby_repo_url="${rvm_ruby_repo_url:-"http://svn.ruby-lang.org/repos/ruby"}"
   # Rubinius sha1's will be available after RC1.
@@ -457,7 +454,7 @@ function __rvm_initialize {
     PATH=$rvm_bin_path:$PATH ; export PATH
   fi
 
-  mkdir -p $rvm_source_path $rvm_bin_path $rvm_archives_path $rvm_path/tmp
+  mkdir -p $rvm_source_path $rvm_bin_path $rvm_archives_path $rvm_gem_path $rvm_temp_path
 }
 
 function __rvm_update {
@@ -650,18 +647,19 @@ Benchmark.bmbm do|benchmark|
 
 RubyCode
 )"
-  echo "$rvm_code" > /tmp/$$.rb
-  cat $rvm_ruby_file >> /tmp/$$.rb
-  echo -e "\n  end\nend\n" >> /tmp/$$.rb
+  echo "$rvm_code" > $rvm_temp_path/$$.rb
+  cat $rvm_ruby_file >> $rvm_temp_path/$$.rb
+  echo -e "\n  end\nend\n" >> $rvm_temp_path/$$.rb
   unset rvm_code
-  rvm_ruby_args="/tmp/$$.rb"
+  rvm_ruby_args="$rvm_temp_path/$$.rb"
   rvm_action="ruby"
-  if [ ! -z "$rvm_debug_flag" ] ; then echo -e "/tmp/$$.rb:\n$(cat /tmp/$$.rb)" ; fi
+  if [ ! -z "$rvm_debug_flag" ] ; then echo -e "$rvm_temp_path/$$.rb:\n$(cat $rvm_temp_path/$$.rb)" ; fi
   __rvm_do
 }
 
 function __rvm_gemset_dump {
-  file_name=${rvm_gem_set_name:-'default'}
+  if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
+  rvm_file_name=${rvm_file_name:-'default'}
 
   echo "# $rvm_gem_set_name.gemset generated gem dump file. Note that any env variable settings will be missing. Append these after using a ';' field separator" > $rvm_gem_set_name.gemset
 
@@ -670,16 +668,17 @@ function __rvm_gemset_dump {
     if [ -z "$rvm_latest_flag" ] ; then
       versions=`echo $gem | awk -F';' '{print $2}' | sed 's/,/ /g'`
       for version in $versions ; do
-        echo "$name -v$version" >> $file_name.gemset
+        echo "$name -v$version" >> $rvm_file_name
       done ; unset version versions
     else
-      echo "$name" >> $file_name.gemset
+      echo "$name" >> $rvm_file_name
     fi ; unset name
   done ; unset file_name
 }
 
 function __rvm_gemset_load {
-  echo "Loading $rvm_load_file file..."
+  if [ -z "$rvm_selected" ] ; then __rvm_select $* ; fi
+  echo "Loading $rvm_file file..."
   rvm_ruby_gem_list=`/bin/ls $rvm_gem_home/specifications/ 2> /dev/null | sed 's/\.gemspec$//' 2> /dev/null`
   while read line
   do # Keep this on 2nd line :( bash fail.
@@ -708,8 +707,8 @@ function __rvm_gemset_load {
       gem_string=`echo "$gem_file_name" | sed 's/\.gem$//'`
       if [ ! -z "`echo "$rvm_ruby_gem_list" | awk "/$gem_string/{print}"`" ] ; then
         if [ ! -z "$rvm_force_flag" ] ; then
-          cp $cache_file $rvm_path/tmp/$gem_file_name
-          gem="$rvm_path/tmp/$gem_file_name" # install as a named local gem
+          cp $cache_file $rvm_temp_path/$gem_file_name
+          gem="$rvm_temp_path/$gem_file_name" # install as a named local gem
         else
           unset gem
           __rvm_log "info" "$gem_name $gem_version is already installed, skipping. (use --force to force these to install regardless)"
@@ -728,13 +727,12 @@ function __rvm_gemset_load {
       fi
     fi
     unset gem gem_prefix gem_name gem_version gem_file_name gem_postfix cache_file gem_file_name gem_string
-  done < <(awk '/^[a-zA-Z]/{print}' "$rvm_load_file")
+  done < <(awk '/^[a-zA-Z]/{print}' "$rvm_file_name")
 }
 
 function __rvm_irbrc {
   if [ -d $rvm_ruby_home -a ! -s $rvm_ruby_irbrc ] ; then
-    rvm_irbrc_file=`cat <<-Config
-load '$HOME/.irbrc' if File.exists?('$HOME/.irbrc') rescue nil
+    rvm_ruby_irbrc_file=$(cat <<-Config
 
 require "irb/completion" rescue nil
 
@@ -749,10 +747,14 @@ require "irb/completion" rescue nil
 @prompt_mode = :DEFAULT
 IRB.conf[:PROMPT][@prompt_mode] = @prompt
 IRB.conf[:PROMPT_MODE] = @prompt_mode
+
+load '$HOME/.irbrc' if File.exists?('$HOME/.irbrc') rescue nil
+
 Config
-`
+)
     touch $rvm_ruby_irbrc
-    echo -e "\n$rvm_irbrc_file" > $rvm_ruby_home/.irbrc
+    echo -e "\n$rvm_ruby_irbrc_file" > $rvm_ruby_home/.irbrc
+    unset rvm_ruby_irbrc_file
   fi
 }
 
@@ -764,44 +766,6 @@ function __rvm_pushpop {
   fi
 }
 
-#
-# ruby supporting libraries:
-#
-function __rvm_readline_install {
-  __rvm_pushpop $rvm_path/src
-  package=readline
-  version=5.2
-  # TODO: Figure out how to list, grab and apply the patches
-  __rvm_fetch "ftp://ftp.gnu.org/gnu/readline/$package-$version.tar.gz"
-  __rvm_run "$package.extract" tar zxf $rvm_archives_path/$package-$version.tar.gz -C $rvm_path/src/
-  cd $rvm_path/src/$package-$version
-  if [ "`uname`" = "Darwin" ] ; then
-    sdk=`ls -t /Developer/SDKs/ | head -n 1`
-    CFLAGS="-isysroot /Developer/SDKs/$sdk -arch i386 -arch x86_64"
-    LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/$sdk -arch i386 -arch x86_64"
-    export CFLAGS LDFLAGS
-    __rvm_run "$package.configure" ./configure --prefix=$rvm_path/usr --disable-dependency-tracking --disable-static --enable-shared
-  else
-    __rvm_run "$package.configure" ./configure --prefix=$rvm_path/usr --disable-dependency-tracking --disable-static --enable-shared
-  fi
-  __rvm_run "$package.make" make
-  __rvm_run "$package.make.install" make install
-  __rvm_pushpop
-}
-
-function __rvm_iconv_install {
-  __rvm_pushpop $rvm_path/src
-  package=libiconv
-  version=1.13.1
-  __rvm_fetch "http://ftp.gnu.org/pub/gnu/libiconv/$package-$version.tar.gz"
-  __rvm_run "$package.extract" tar zxf $rvm_archives_path/$package-$version.tar.gz -C $rvm_dir/src/
-  cd $rvm_path/src/$package-$version
-  __rvm_run "$package.configure" ./configure --prefix=$rvm_path/usr --disable-shared
-  __rvm_run "$package.make" make
-  __rvm_run "$package.make.install" make install
-  __rvm_pushpop
-}
-
 function __rvm_state {
   if [ -z "$rvm_state" ] ; then
     if [ -z "$(which ruby | awk /`basename $rvm_path`/)" ] ; then
@@ -830,3 +794,38 @@ function __rvm_inspect {
   done
 }
 
+#
+# ruby supporting libraries:
+#
+function __rvm_readline_install {
+  __rvm_pushpop $rvm_source_path
+  package="readline" ; version="5.2"
+  # TODO: Figure out how to list, grab and apply the patches
+  __rvm_fetch "ftp://ftp.gnu.org/gnu/readline/$package-$version.tar.gz"
+  __rvm_run "$package.extract" tar zxf $rvm_archives_path/$package-$version.tar.gz -C $rvm_source_path
+  cd $rvm_source_path/$package-$version
+  if [ "`uname`" = "Darwin" ] ; then
+    sdk=`ls -t /Developer/SDKs/ | head -n 1`
+    CFLAGS="-isysroot /Developer/SDKs/$sdk -arch i386 -arch x86_64"
+    LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/$sdk -arch i386 -arch x86_64"
+    export CFLAGS LDFLAGS
+    __rvm_run "$package.configure" "./configure --prefix=$rvm_path/usr --disable-dependency-tracking --disable-static --enable-shared"
+  else
+    __rvm_run "$package.configure" "./configure --prefix=$rvm_path/usr --disable-dependency-tracking --disable-static --enable-shared"
+  fi
+  __rvm_run "$package.make" "/usr/bin/make $rvm_make_flags"
+  __rvm_run "$package.make.install" "/usr/bin/make install"
+  __rvm_pushpop
+}
+
+function __rvm_iconv_install {
+  __rvm_pushpop $rvm_source_path
+  package="libiconv" ; version=1.13.1
+  __rvm_fetch "http://ftp.gnu.org/pub/gnu/libiconv/$package-$version.tar.gz"
+  __rvm_run "$package.extract" "tar zxf $rvm_archives_path/$package-$version.tar.gz -C $rvm_source_path"
+  cd $rvm_source_path/$package-$version
+  __rvm_run "$package.configure" "./configure --prefix=$rvm_path/usr --disable-shared"
+  __rvm_run "$package.make" "/usr/bin/make $rvm_make_flags"
+  __rvm_run "$package.make.install" "/usr/bin/make install"
+  __rvm_pushpop
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.49
+  version: 0.0.50
 platform: ruby
 authors: 
 - Wayne E. Seguin
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-24 00:00:00 -04:00
+date: 2009-09-28 00:00:00 -04:00
 default_executable: rvm-install
 dependencies: []