Merge branch 'hotfix/1.12.2' into stable

phildobbin · Apr 11, 2012 · e3f7052 · e3f7052
2 parents 53d42d8 + 3278f7b
commit e3f7052
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 5 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.12.1
+1.12.2
diff --git a/scripts/functions/manage/goruby b/scripts/functions/manage/goruby
@@ -99,7 +99,10 @@ goruby_install()
   export GEM_HOME="$rvm_ruby_gem_home"
   export GEM_PATH="$rvm_ruby_gem_path"
 
-  "$rvm_scripts_path/rubygems" latest
+  (
+    rvm_create_flag=1 __rvm_use
+    "$rvm_scripts_path/rubygems" ${rvm_rubygems_version:-latest}
+  )
 
   __rvm_bin_script
 

diff --git a/scripts/functions/manage/ironruby b/scripts/functions/manage/ironruby
@@ -118,6 +118,10 @@ chmod +x "$rvm_ruby_home/bin/ir"
 
 ln -fs "$rvm_ruby_home/bin/ir" "$rvm_ruby_home/bin/ruby"
 
+(
+  rvm_create_flag=1 __rvm_use
+)
+
 builtin hash -r
 
 __rvm_run "gems.install" \

diff --git a/scripts/functions/manage/jruby b/scripts/functions/manage/jruby
@@ -98,7 +98,7 @@ jruby_install()
 
   __rvm_bin_script
 
-  __rvm_use
+  rvm_create_flag=1 __rvm_use
 
   __rvm_post_install
 

diff --git a/scripts/functions/manage/maglev b/scripts/functions/manage/maglev
@@ -148,5 +148,5 @@ maglev_install()
 
   __rvm_bin_script
 
-  __rvm_use
+  rvm_create_flag=1 __rvm_use
 }
diff --git a/scripts/functions/manage/ree b/scripts/functions/manage/ree
@@ -94,7 +94,7 @@ ree_install()
     chmod +x "$rvm_ruby_home"/bin/*
 
     (
-      __rvm_use
+      rvm_create_flag=1 __rvm_use
       "$rvm_scripts_path/rubygems" ${rvm_rubygems_version:-latest}
     )
     __rvm_bin_script

diff --git a/scripts/functions/manage/rubinius b/scripts/functions/manage/rubinius
@@ -227,6 +227,10 @@ rbx_install()
 
   unset file_name
 
+  (
+    rvm_create_flag=1 __rvm_use
+  )
+
   binaries=(erb ri rdoc)
 
   __rvm_post_install