Expand path relative to pwd in the settings validator

1 files changed, 8 insertions, 4 deletions

diff --git a/lib/bundler/cli/install.rb b/lib/bundler/cli/install.rb
index 10f3a98002..d878081df7 100644
--- a/lib/bundler/cli/install.rb
+++ b/lib/bundler/cli/install.rb
@@ -167,10 +167,14 @@ module Bundler
     end
 
     def normalize_settings
-      CLI::Common.set_path nil if options[:system]
-      CLI::Common.set_path "vendor/bundle" if options[:deployment]
-      CLI::Common.set_path options["path"], :if_given
-      CLI::Common.set_path "bundle" if options["standalone"] && Bundler.settings[:path].nil?
+      Bundler.settings.set_command_option :path, nil if options[:system]
+      Bundler.settings.temporary(:path_relative_to_cwd => false) do
+        Bundler.settings.set_command_option :path, "vendor/bundle" if options[:deployment]
+      end
+      Bundler.settings.set_command_option_if_given :path, options[:path]
+      Bundler.settings.temporary(:path_relative_to_cwd => false) do
+        Bundler.settings.set_command_option :path, "bundle" if options["standalone"] && Bundler.settings[:path].nil?
+      end
 
       bin_option = options["binstubs"]
       bin_option = nil if bin_option && bin_option.empty?