[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

2 files changed, 2 insertions, 2 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
diff --git a/lib/bundler/installer/standalone.rb b/lib/bundler/installer/standalone.rb
index 248b677233..2756626f8a 100644
--- a/lib/bundler/installer/standalone.rb
+++ b/lib/bundler/installer/standalone.rb
@@ -47,7 +47,7 @@ module Bundler
     end
 
     def bundler_path
-      Bundler.root.join(Bundler.settings[:path], "bundler")
+      Bundler.root.join(Bundler.settings[:path].to_s, "bundler")
     end
 
     def gem_path(path, spec)