summaryrefslogtreecommitdiff
path: root/tool
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-18 09:00:02 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-18 09:00:02 +0000
commitcfdd154b903c922ecea8da12a53fc91b3d026789 (patch)
treeae0d485c9e508b69cc53b4ce06506f3638399bea /tool
parent80e35fa21c27ff442ba5f796e118b078e57a0fee (diff)
merges r28134 from trunk into ruby_1_9_2.
-- Allow bin/* install from dot-dirs. Fixes rvm and multiruby installations. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@34676 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool')
-rwxr-xr-xtool/rbinstall.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index f690911f5c..79aee2e476 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)])