summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-02-16 00:51:48 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-02-16 00:51:48 +0000
commit9cedfbcb918176627a9ed0a462480e52c9991c6c (patch)
treedbf308b73065e7a1d3be3904d37f4f6886861c56
parent2708fb6ba7636adf1d8263dd2654f257f8b76324 (diff)
rbinstall.rb: drive letter in without_destdir
* tool/rbinstall.rb (without_destdir): just strip a drive letter which is prepended by with_destdir. pointed out by @DavidEGrayson. https://github.com/ruby/ruby/commit/0e5f9ae#commitcomment-16101763 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53840 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rwxr-xr-xtool/rbinstall.rb1
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e697aa4..98b9773 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Feb 16 09:51:20 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * tool/rbinstall.rb (without_destdir): just strip a drive letter
+ which is prepended by with_destdir.
+ pointed out by @DavidEGrayson.
+ https://github.com/ruby/ruby/commit/0e5f9ae#commitcomment-16101763
+
Tue Feb 16 04:42:13 2016 NARUSE, Yui <naruse@ruby-lang.org>
* insns.def (opt_plus): simply use LONG2NUM() instead of wrongly
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index 1cca55d..72cca6c 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
@@ -282,7 +282,6 @@ end
def without_destdir(dir)
return dir if !$destdir or $destdir.empty?
- dir = dir.sub(/\A\w:/, '') if File::PATH_SEPARATOR == ';'
dir.start_with?($destdir) ? dir[$destdir.size..-1] : dir
end