From b7ace19ab5de939175cf81718ea7f2166ebb6c82 Mon Sep 17 00:00:00 2001 From: Michal Papis Date: Tue, 29 Jan 2013 07:45:54 +0100 Subject: [PATCH 1/2] 1.18.5 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index a67b05e878..8e8b0a9335 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.18.4 +1.18.5 From 7ecd8ed06726de2095febab51f620d41f9cb1ee1 Mon Sep 17 00:00:00 2001 From: Michal Papis Date: Tue, 29 Jan 2013 07:41:54 +0100 Subject: [PATCH 2/2] fix random ree installation error --- patches/ree/ruby-binary-shebang.patch | 11 +++++++++++ scripts/functions/manage/ree | 1 + 2 files changed, 12 insertions(+) create mode 100644 patches/ree/ruby-binary-shebang.patch diff --git a/patches/ree/ruby-binary-shebang.patch b/patches/ree/ruby-binary-shebang.patch new file mode 100644 index 0000000000..ddd3171e31 --- /dev/null +++ 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 index 4f38d9f081..2483fb36e0 100644 --- 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