diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-12-04 14:49:47 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-12-04 14:49:47 +0000 |
| commit | d8a9c4e13ab1715609457fa960d7dd9a7c1439ce (patch) | |
| tree | 1fdc6e6cfe1b02ce2546390fd64ee52f35544e92 /instruby.rb | |
| parent | 3d08798db04ac6343b711a7bfbebae5e27effee5 (diff) | |
| download | ruby-d8a9c4e13ab1715609457fa960d7dd9a7c1439ce.tar.gz ruby-d8a9c4e13ab1715609457fa960d7dd9a7c1439ce.tar.xz ruby-d8a9c4e13ab1715609457fa960d7dd9a7c1439ce.zip | |
* instruby.rb (install_recursive): get rid of warning.
* lib/optparse.rb (CompletingHash#match): get rid of splat failure.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@11337 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'instruby.rb')
| -rw-r--r-- | instruby.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/instruby.rb b/instruby.rb index 5548fa1f9..8327d8c57 100644 --- a/instruby.rb +++ b/instruby.rb @@ -122,10 +122,10 @@ def makedirs(dirs) super(dirs, :mode => 0755) unless dirs.empty? end -def install_recursive(src, dest, options = {}) +def install_recursive(srcdir, dest, options = {}) noinst = options.delete(:no_install) - subpath = src.size..-1 - Dir.glob("#{src}/**/*", File::FNM_DOTMATCH) do |src| + subpath = srcdir.size..-1 + Dir.glob("#{srcdir}/**/*", File::FNM_DOTMATCH) do |src| next if /\A\.{1,2}\z/ =~ (base = File.basename(src)) next if noinst and File.fnmatch?(noinst, File.basename(src)) d = dest + src[subpath] |