summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-08-28 02:39:22 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-08-28 02:39:22 +0000
commit715666cc28d441862778000c56a807c9b4c28d00 (patch)
tree39237651e788ab379ff8e1228095295d6f0cbdce
parent4d9c23772ff75b88aa397d913a0477f233d38541 (diff)
Fixed test failures in mswin environment at r64555.
[ruby-core:88699][Bug #15035] This patch was provided by MSP-Greg. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64582 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--lib/rubygems/installer.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb
index e9ad4d0..657f212 100644
--- a/lib/rubygems/installer.rb
+++ b/lib/rubygems/installer.rb
@@ -771,18 +771,19 @@ TEXT
# return the stub script text used to launch the true Ruby script
def windows_stub_script(bindir, bin_file_name)
+ rb_bindir = RbConfig::CONFIG["bindir"]
# All comparisons should be case insensitive
- if bindir.downcase == RbConfig::CONFIG["bindir"].downcase
+ if bindir.downcase == rb_bindir.downcase
# stub & ruby.exe withing same folder. Portable
<<-TEXT
@ECHO OFF
@"%~dp0ruby.exe" "%~dpn0" %*
TEXT
- elsif bindir.downcase.start_with? RbConfig::TOPDIR.downcase
+ elsif bindir.downcase.start_with? (RbConfig::TOPDIR || File.dirname(rb_bindir)).downcase
# stub within ruby folder, but not standard bin. Not portable
require 'pathname'
from = Pathname.new bindir
- to = Pathname.new RbConfig::CONFIG["bindir"]
+ to = Pathname.new rb_bindir
rel = to.relative_path_from from
<<-TEXT
@ECHO OFF