diff options
| author | Igor Bozato <igor.hrk@gmail.com> | 2017-08-28 15:53:54 -0300 |
|---|---|---|
| committer | Samuel Giddins <segiddins@segiddins.me> | 2017-09-08 10:46:55 -0700 |
| commit | 9a9a8173d2e35966cf915274d6940465af7c18eb (patch) | |
| tree | 2a5962c93ffaafc4329bbff930fb16da661e62bc | |
| parent | e1bbd9330d203fa4c37384a0ac60de195545056f (diff) | |
| download | bundler-9a9a8173d2e35966cf915274d6940465af7c18eb.tar.gz | |
Expand path where it is used
| -rw-r--r-- | lib/bundler/cli/install.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/bundler/cli/install.rb b/lib/bundler/cli/install.rb index 3f4b4f7239..bb91b3de86 100644 --- a/lib/bundler/cli/install.rb +++ b/lib/bundler/cli/install.rb @@ -168,9 +168,11 @@ module Bundler end def normalize_settings + path = Bundler.feature_flag.path_relative_to_cwd? ? File.expand_path(options["path"]) : options["path"] if options["path"] + Bundler.settings.set_command_option :path, nil if options[:system] Bundler.settings.set_command_option :path, "vendor/bundle" if options[:deployment] - Bundler.settings.set_command_option :path, Bundler.feature_flag.path_relative_to_cwd? ? File.expand_path(options["path"]) : options["path"] if options["path"] + Bundler.settings.set_command_option_if_given :path, path Bundler.settings.set_command_option :path, "bundle" if options["standalone"] && Bundler.settings[:path].nil? bin_option = options["binstubs"] |