From 18b4480e31e83d6dfb0283075698613e0f852fa7 Mon Sep 17 00:00:00 2001 From: ryan Date: Wed, 2 Jun 2010 20:42:29 +0000 Subject: [PATCH] Allow bin/* install from dot-dirs. Fixes rvm and multiruby installations. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28134 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ tool/rbinstall.rb | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e15a3fb353..8808caf245 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Jun 3 05:37:46 2010 Ryan Davis + + * tool/rbinstall.rb (install-bin): Allow bin/* install from dot-dirs. + Fixes rvm and multiruby installations. + Thu Jun 3 01:22:45 2010 Hidetoshi NAGAI * ext/tk/lib/tk.rb: fix typo and race condition. diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index adbe691cf9..ca392e14c7 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -404,7 +404,9 @@ install?(:local, :comm, :bin, :'bin-comm') do end for src in Dir[File.join(srcdir, "bin/*")] next unless File.file?(src) - next if /\/[.#]|(\.(old|bak|orig|rej|diff|patch|core)|~|\/core)$/i =~ src + s = src.downcase + next if %w(old bak orig rej diff patch core).include? File.extname(s) + next if /^\.\#|(~|core)$/i =~ File.basename(s) name = RbConfig.expand(trans[File.basename(src)])