manage in rvm-0.1.19

- old
+ new

@@ -4,11 +4,10 @@
 original_ruby_string=$rvm_ruby_string
 
 source $rvm_scripts_path/initialize
 source $rvm_scripts_path/utility
 source $rvm_scripts_path/selector
-source $rvm_scripts_path/libraries
 
 trap "rm -f $rvm_tmp_path/$$* > /dev/null 2>&1 ; exit" 0 1 2 3 15
 
 if [[ ! -z "$rvm_trace_flag" ]] ; then set -x ; export rvm_trace_flag ; fi
 
@@ -111,11 +110,13 @@
 
   case "$rvm_ruby_interpreter" in
     macruby)
       if [[ "Darwin" = "$(uname)" ]] ; then
         if [[ "$rvm_head_flag" = 1 ]] ; then
-          if [[ ! -z "$rvm_llvm_flag" ]] ; then __rvm_install_llvm ; fi
+          if [[ ! -z "$rvm_llvm_flag" ]] ; then
+            $rvm_scripts_path/package llvm install
+          fi
           macruby_path="/usr/local/bin"
           # TODO: configure & make variables should be set here.
           rvm_ruby_configure=" true "
           rvm_ruby_make="rake"
           rvm_ruby_make_install="sudo rake install"
@@ -368,11 +369,15 @@
 
       builtin cd "$rvm_ruby_src_path"
       if [[ ! -z "$rvm_head_flag" ]] ; then __rvm_run "ant.dist" "ant dist" "Running 'ant dist' (this could take a few minutes) ..." ; fi
 
       mkdir -p "$rvm_ruby_home/bin/"
-      __rvm_run "nailgun" "builtin cd \"$rvm_ruby_src_path/tool/nailgun\" && ./configure --prefix=$rvm_ruby_home && make $rvm_make_flags" "Building Nailgun"
+      if $rvm_scripts_path/match "$rvm_ruby_version" "1\.3" || $rvm_scripts_path/match "$rvm_ruby_version" "1\.2" ; then
+        __rvm_run "nailgun" "builtin cd \"$rvm_ruby_src_path/tool/nailgun\" &&  make $rvm_make_flags" "Building Nailgun"
+      else
+        __rvm_run "nailgun" "builtin cd \"$rvm_ruby_src_path/tool/nailgun\" && ./configure --prefix=$rvm_ruby_home && make $rvm_make_flags" "Building Nailgun"
+      fi
 
       __rvm_pushpop
 
       if [[ -z "$rvm_ruby_home" ]] || [[ "$rvm_ruby_home" = "/" ]] ; then echo "WTH?!?! rvm_ruby_home == / ??? not removing." ; return 1000000 ; fi
       rm -rf $rvm_ruby_home
@@ -858,11 +863,10 @@
     install=0
   else
     install=1
   fi
 
-
   if [[ "$install" -eq 0 ]] ; then
     # 1.9.X has it's own built-in gem command
     __rvm_inject_ruby_shebang "$rvm_ruby_src_path/bin/gem"
     __rvm_inject_gem_env "$rvm_ruby_home/bin/gem"
     cp $rvm_ruby_src_path/bin/gem $rvm_ruby_home/bin/gem
@@ -965,11 +969,11 @@
 }
 
 __rvm_manage_rubies() {
   rubies=() ; successes=() ; errors=() ; statuses=()
 
-  unset rvm_gem_set_name rvm_ruby_selected_flag
+  unset rvm_gemset_name rvm_ruby_selected_flag
 
   rvm_ruby_gem_home=$(echo $rvm_ruby_gem_home | awk -F'%' '{print $1}')
   rvm_ruby_string=$(echo $rvm_ruby_string | awk -F'%' '{print $1}')
 
   # TODO: Extract the common functionality out of the if below
@@ -1008,5 +1012,6 @@
 }
 
 rvm_action="$1" ; rubies_string="$2"
 __rvm_manage_rubies
 exit $?
+