diff options
author | ryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-02 20:42:29 +0000 |
---|---|---|
committer | ryan <ryan@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-02 20:42:29 +0000 |
commit | 18b4480e31e83d6dfb0283075698613e0f852fa7 (patch) | |
tree | 53e7d7c5275fa2fbd2d26ad1f255fc102a48c11f | |
parent | ed02f66eca55e3dd87219bb080f949f4346a15b2 (diff) |
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
-rw-r--r-- | ChangeLog | 5 | ||||
-rwxr-xr-x | tool/rbinstall.rb | 4 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Thu Jun 3 05:37:46 2010 Ryan Davis <ryand-ruby@zenspider.com> + + * 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 <nagai@ai.kyutech.ac.jp> * 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)]) |