diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-06-10 07:05:39 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-06-10 07:05:39 +0000 |
| commit | 3c7ad9d6b28353ec0a8601c198fb9e7e22937100 (patch) | |
| tree | fbd94546c5596700a72515b37776eee0618eab3f | |
| parent | 083bbad271615755bed7bd06d472c8be0d7c1eab (diff) | |
| download | ruby-3c7ad9d6b28353ec0a8601c198fb9e7e22937100.tar.gz ruby-3c7ad9d6b28353ec0a8601c198fb9e7e22937100.tar.xz ruby-3c7ad9d6b28353ec0a8601c198fb9e7e22937100.zip | |
* instruby.rb (install_recursive): skip .svn directories.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@12508 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | instruby.rb | 5 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Sun Jun 10 16:07:10 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * instruby.rb (install_recursive): skip .svn directories. + Sun Jun 10 15:44:43 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * win32/Makefile.sub (config.status): rubyhdrdir was missing. diff --git a/instruby.rb b/instruby.rb index d813d0fdd..04add9346 100755 --- a/instruby.rb +++ b/instruby.rb @@ -126,7 +126,10 @@ def install_recursive(srcdir, dest, options = {}) noinst = options.delete(:no_install) subpath = srcdir.size..-1 Dir.glob("#{srcdir}/**/*", File::FNM_DOTMATCH) do |src| - next if /\A\.{1,2}\z|\A\.\#|\A\#.*\#\z|~\z/ =~ (base = File.basename(src)) + case base = File.basename(src) + when /\A\.{1,2}\z/, /\A\.\#/, /\A\#.*\#\z/, /~\z/, /\A\.svn\z/ + next + end if noinst if Array === noinst next if noinst.any? {|n| File.fnmatch?(n, base)} |
