Merge branch 'hotfix/1.18.5' into stable

rvm · Jan 29, 2013 · ed031c8 · ed031c8
2 parents 131e869 + 7ecd8ed
commit ed031c8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.18.4
+1.18.5
diff --git a/patches/ree/ruby-binary-shebang.patch b/patches/ree/ruby-binary-shebang.patch
@@ -0,0 +1,11 @@
+--- a/installer.rb
++++ b/installer.rb
+@@ -596,7 +596,7 @@
+ 				rest = nil
+ 				File.open(filename, 'rb') do |f|
+ 					shebang = f.readline
+-					if shebang =~ /ruby/
++					if shebang =~ /^#!.*ruby/
+ 						puts "Updating #{filename}..."
+ 						rest = f.read
+ 					end
diff --git a/scripts/functions/manage/ree b/scripts/functions/manage/ree
@@ -87,6 +87,7 @@ ree_install()
       __rvm_apply_patches "${rvm_src_path}/$rvm_ruby_string" lib64
       result=$?
     fi
+    __rvm_apply_patches "${rvm_src_path}/$rvm_ruby_string" ruby-binary-shebang
 
     if (( result > 0 ))
     then