From 9a46638fb3fc1d34059861a803c11a3efcff9ea8 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 30 Jun 2009 07:57:11 +0000
Subject: [PATCH] * tool/rbinstall.rb: renamed to get rid of collision against 
  instruction.rb on command line completion of shell.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23914 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                          | 5 ++++-
 common.mk                          | 2 +-
 tool/{instruby.rb => rbinstall.rb} | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
 rename tool/{instruby.rb => rbinstall.rb} (99%)

diff --git a/ChangeLog b/ChangeLog
index fd3d8826e1..e5a535670b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Tue Jun 30 16:55:32 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Jun 30 16:57:07 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/rbinstall.rb: renamed to get rid of collision agains
+	  instruction.rb on command line completion of shell.
 
 	* tool/mkconfig.rb (RbConfig.expand): get rid of exceptions on
 	  frozen strings unless really changed.
diff --git a/common.mk b/common.mk
index 7daffca5da..9da31daa6e 100644
--- a/common.mk
+++ b/common.mk
@@ -103,7 +103,7 @@ SCRIPT_ARGS   =	--dest-dir="$(DESTDIR)" \
 		--make-flags="$(MAKEFLAGS)"
 EXTMK_ARGS    =	$(SCRIPT_ARGS) --extension $(EXTS) --extstatic $(EXTSTATIC) \
 		--make-flags="MINIRUBY='$(MINIRUBY)'" --
-INSTRUBY      =	$(MINIRUBY) $(srcdir)/tool/instruby.rb
+INSTRUBY      =	$(MINIRUBY) $(srcdir)/tool/rbinstall.rb
 INSTRUBY_ARGS =	$(SCRIPT_ARGS) \
 		--data-mode=$(INSTALL_DATA_MODE) \
 		--prog-mode=$(INSTALL_PROG_MODE) \
diff --git a/tool/instruby.rb b/tool/rbinstall.rb
similarity index 99%
rename from tool/instruby.rb
rename to tool/rbinstall.rb
index 2ad8acf2c2..621fffc70d 100755
--- a/tool/instruby.rb
+++ b/tool/rbinstall.rb
@@ -221,7 +221,7 @@ def install_recursive(srcdir, dest, options = {})
       Dir.foreach(file) do |f|
         src = File.join(file, f)
         d = File.join(dest, dir = src[subpath])
-        stat = File.lstat(src) rescue next
+        stat = File.stat(src) rescue next
         if stat.directory?
           files << [src, d, true] if /\A\./ !~ f and !prune[dir]
         else