summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xtool/rbinstall.rb4
2 files changed, 8 insertions, 1 deletions
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 <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)])