diff options
| author | Samuel Giddins <segiddins@segiddins.me> | 2017-06-03 14:56:31 -0500 |
|---|---|---|
| committer | Samuel Giddins <segiddins@segiddins.me> | 2017-06-13 13:16:58 -0500 |
| commit | 4337a499d0108fc3748084934aaed7591b355a26 (patch) | |
| tree | 099dcf59f533ec5d0a3e40e2a1aec6959f03850e /lib/bundler/runtime.rb | |
| parent | e8fd5795778379bd821e34173b678f76f240fa97 (diff) | |
| download | bundler-4337a499d0108fc3748084934aaed7591b355a26.tar.gz | |
Ensure Bundler.original_env preserves _all_ keys bundler setsseg-original-env-all-keys
Diffstat (limited to 'lib/bundler/runtime.rb')
| -rw-r--r-- | lib/bundler/runtime.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/bundler/runtime.rb b/lib/bundler/runtime.rb index 5540509d74..152471db85 100644 --- a/lib/bundler/runtime.rb +++ b/lib/bundler/runtime.rb @@ -262,9 +262,6 @@ module Bundler end def setup_manpath - # Store original MANPATH for restoration later in with_clean_env() - ENV["BUNDLER_ORIG_MANPATH"] = ENV["MANPATH"] - # Add man/ subdirectories from activated bundles to MANPATH for man(1) manuals = $LOAD_PATH.map do |path| man_subdir = path.sub(/lib$/, "man") @@ -272,7 +269,7 @@ module Bundler end.compact return if manuals.empty? - ENV["MANPATH"] = manuals.concat( + Bundler::SharedHelpers.set_env "MANPATH", manuals.concat( ENV["MANPATH"].to_s.split(File::PATH_SEPARATOR) ).uniq.join(File::PATH_SEPARATOR) end |