Finishing touches for kiji interpreter thanks to initiative by Blue B…

…ox Group.

config/db

@@ -56,7 +56,7 @@ ree_1.8.7_url=http://rvm.beginrescueend.com/src
 ree_1.8.7_repo_url=git://github.com/FooBarWidget/rubyenterpriseedition187-330
 ree_1.8.7_patch_level=2011.03
 kiji_repo_url=git://github.com/twitter/rubyenterpriseedition187-248.git
-kiji_patch_level=2010.02
+kiji_version=head
 jruby_version=1.6.0
 jruby_repo_url=git://github.com/jruby/jruby.git
 jruby_url=http://jruby.org.s3.amazonaws.com/downloads

scripts/manage

@@ -1114,11 +1114,12 @@ RubyWrapper
       __rvm_run "chmod.bin" "chmod +x $rvm_ruby_home/bin/*"
 
       __rvm_post_install
-	  rm $rvm_ruby_home/bin/ruby
-	  ln -s $rvm_ruby_home/bin/goruby $rvm_ruby_home/bin/ruby
+
+      rm $rvm_ruby_home/bin/ruby
+      ln -s $rvm_ruby_home/bin/goruby $rvm_ruby_home/bin/ruby
     ;;
 
-    ruby)
+    ruby|kiji)
 
       __rvm_check_for_bison # && Run like hell...
       if [[ $? -gt 0 ]] ; then exit $result ; fi

scripts/selector

@@ -157,16 +157,6 @@ __rvm_select()
         fi
       fi
 
-    kiji)
-      rvm_ruby_interpreter="kiji"
-      rvm_ruby_version="head"
-      rvm_ruby_string="kiji"
-      rvm_ruby_patch_level=""
-      rvm_ruby_repo_url=${rvm_mput_repo_url:-"$(__rvm_db "kiji_repo_url")"}
-      rvm_ruby_url=$rvm_ruby_repo_url
-      rvm_ruby_configure="" ; rvm_ruby_make="" ; rvm_ruby_make_install=""
-    ;;
-
       case "$rvm_ruby_version" in
         1.8.*)
           : # all good!
@@ -178,6 +168,17 @@ __rvm_select()
       esac
     ;;
 
+    kiji)
+      rvm_ruby_interpreter="kiji"
+      rvm_ruby_version="head"
+      rvm_head_flag=1
+      rvm_ruby_string="kiji-head"
+      rvm_ruby_patch_level=""
+      rvm_ruby_repo_url=${rvm_mput_repo_url:-"$(__rvm_db "kiji_repo_url")"}
+      rvm_ruby_url=$rvm_ruby_repo_url
+      rvm_ruby_configure="" ; rvm_ruby_make="" ; rvm_ruby_make_install=""
+    ;;
+
     goruby)
       rvm_ruby_interpreter="goruby"
       rvm_ruby_version="head"
@@ -235,7 +236,7 @@ __rvm_select()
 
   if [[ -n "$rvm_ruby_interpreter" && "system" != "$rvm_ruby_interpreter" && "default" != "$rvm_ruby_interpreter" ]] ; then
 
-    if [[ ! -z "$rvm_ruby_version" ]] ; then
+    if [[ -n "$rvm_ruby_version" ]] ; then
       rvm_ruby_release_version="${rvm_ruby_version/.*/}"
       rvm_ruby_major_version=${rvm_ruby_version%.*} ; rvm_ruby_major_version=${rvm_ruby_major_version#*.}
       rvm_ruby_minor_version="${rvm_ruby_version//*.}"