diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-02-15 17:50:08 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-02-15 17:50:08 +0000 |
| commit | 0e5f9aeaeafe2fa9189956010ba45fdd41d6076d (patch) | |
| tree | 538c0535e314467d752bbcef0a14a84bb2d97dae /tool/rbinstall.rb | |
| parent | afc0a5f04c74ab05c21c1c5de16ab83307d5a042 (diff) | |
rbinstall.rb: drive letter in without_destdir
* tool/rbinstall.rb (without_destdir): compare with the destdir
after stripping a drive letter, on dosish platforms.
pointed out by @DavidEGrayson.
https://github.com/ruby/ruby/commit/d0cf23b#commitcomment-16100407
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53838 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool/rbinstall.rb')
| -rwxr-xr-x | tool/rbinstall.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index 4614c3538a..1cca55d919 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -281,9 +281,9 @@ def with_destdir(dir) end def without_destdir(dir) - return dir if !$destdir or $destdir.empty? or !dir.start_with?($destdir) + return dir if !$destdir or $destdir.empty? dir = dir.sub(/\A\w:/, '') if File::PATH_SEPARATOR == ';' - dir[$destdir.size..-1] + dir.start_with?($destdir) ? dir[$destdir.size..-1] : dir end def prepare(mesg, basedir, subdirs=nil) |