summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorCody Cutrer <cody@instructure.com>2024-04-11 10:21:01 -0600
committergit <svn-admin@ruby-lang.org>2024-04-11 19:35:28 +0000
commitc5e661b1d720cf5452c3fd5264b73063ca9c4515 (patch)
treea2389f91d399cc59ce7609bde4710b727aa052ef /lib
parentcd516ebd20a8d2c7b0f912e4d5750f84616463a5 (diff)
[rubygems/rubygems] Fix installing plugins via relative paths
This affected both CLI and Gemfile installs https://github.com/rubygems/rubygems/commit/a0d101a8df
Diffstat (limited to 'lib')
-rw-r--r--lib/bundler/plugin/installer.rb2
-rw-r--r--lib/bundler/plugin/installer/path.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/bundler/plugin/installer.rb b/lib/bundler/plugin/installer.rb
index 6771f3f153..4f60862bb4 100644
--- a/lib/bundler/plugin/installer.rb
+++ b/lib/bundler/plugin/installer.rb
@@ -77,7 +77,7 @@ module Bundler
def install_path(names, version, path)
source_list = SourceList.new
- source = source_list.add_path_source({ "path" => path })
+ source = source_list.add_path_source({ "path" => path, "root_path" => SharedHelpers.pwd })
install_all_sources(names, version, source_list, source)
end
diff --git a/lib/bundler/plugin/installer/path.rb b/lib/bundler/plugin/installer/path.rb
index 1b60724b5e..58a8fa7426 100644
--- a/lib/bundler/plugin/installer/path.rb
+++ b/lib/bundler/plugin/installer/path.rb
@@ -5,7 +5,7 @@ module Bundler
class Installer
class Path < Bundler::Source::Path
def root
- Plugin.root
+ SharedHelpers.in_bundle? ? Bundler.root : Plugin.root
end
def generate_bin(spec, disable_extensions = false)