diff options
| author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2022-07-24 22:32:34 +0200 |
|---|---|---|
| committer | git <svn-admin@ruby-lang.org> | 2022-07-30 04:24:25 +0900 |
| commit | 030050cdfa9ae65cbbcd0f708aa2459e0ef17c3a (patch) | |
| tree | 0e98df397935998124faf5a9d1c9bec509bb64b8 /lib/bundler/cli | |
| parent | b515fdcc32a6a7d484c73f090fa2a58a8662e6ca (diff) | |
[rubygems/rubygems] Make `--standalone` play nice with `--local`
I'm not sure if using relative paths in the generated script is best for
this case, since it makes the script not movable, but that can be
improved later.
https://github.com/rubygems/rubygems/commit/7f5bdbb842
Diffstat (limited to 'lib/bundler/cli')
| -rw-r--r-- | lib/bundler/cli/install.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler/cli/install.rb b/lib/bundler/cli/install.rb index 1601fc6a98..851ae9b840 100644 --- a/lib/bundler/cli/install.rb +++ b/lib/bundler/cli/install.rb @@ -148,7 +148,7 @@ module Bundler Bundler.settings.set_command_option :path, nil if options[:system] Bundler.settings.set_command_option_if_given :path, options[:path] - if options["standalone"] && Bundler.settings[:path].nil? + if options["standalone"] && Bundler.settings[:path].nil? && !options["local"] Bundler.settings.temporary(:path_relative_to_cwd => false) do Bundler.settings.set_command_option :path, "bundle" end |