diff options
author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2020-07-14 13:16:34 +0200 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-07-31 21:07:19 +0900 |
commit | 985309ac38c212de327e419ad4a7bcf9e7b28267 (patch) | |
tree | c6da2463749b7cde7c4ad6a2ff1faeeff1d07025 | |
parent | 04d3e0727a15367971678ff913402745cbaede5e (diff) |
[rubygems/rubygems] Support PATH's using `File::ALT_SEPARATOR` in `Gem::Installer`
Co-authored-by: MSP-Greg <MSP-Greg@users.noreply.github.com>
https://github.com/rubygems/rubygems/commit/710b969b60
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/3379
-rw-r--r-- | lib/rubygems/installer.rb | 2 | ||||
-rw-r--r-- | test/rubygems/test_gem_installer.rb | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb index c9d87c5617..0639672137 100644 --- a/lib/rubygems/installer.rb +++ b/lib/rubygems/installer.rb @@ -707,6 +707,8 @@ class Gem::Installer user_bin_dir = user_bin_dir.tr(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR path = ENV['PATH'] + path = path.tr(File::ALT_SEPARATOR, File::SEPARATOR) if File::ALT_SEPARATOR + if Gem.win_platform? path = path.downcase user_bin_dir = user_bin_dir.downcase diff --git a/test/rubygems/test_gem_installer.rb b/test/rubygems/test_gem_installer.rb index 766a4ee8f2..49ecc549e9 100644 --- a/test/rubygems/test_gem_installer.rb +++ b/test/rubygems/test_gem_installer.rb @@ -207,6 +207,16 @@ gem 'other', version end assert_empty @ui.error + + return unless win_platform? + + ENV['PATH'] = [orig_PATH, bin_dir.tr(File::SEPARATOR, File::ALT_SEPARATOR)].join(File::PATH_SEPARATOR) + + use_ui @ui do + installer.check_that_user_bin_dir_is_in_path + end + + assert_empty @ui.error ensure ENV['PATH'] = orig_PATH end |