`bundle install --binstubs ""` will remove binstubs option

2 files changed, 14 insertions, 1 deletions

diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb
index f42b9d56bd..3201f2315b 100644
--- a/lib/bundler/cli.rb
+++ b/lib/bundler/cli.rb
@@ -216,7 +216,8 @@ module Bundler
       Bundler.settings[:path]   = "vendor/bundle" if opts[:deployment]
       Bundler.settings[:path]   = opts[:path] if opts[:path]
       Bundler.settings[:path] ||= "bundle" if opts[:standalone]
-      Bundler.settings[:bin]    = opts["binstubs"] if opts[:binstubs]
+      Bundler.settings[:bin] = opts["binstubs"] if opts["binstubs"]
+      Bundler.settings[:bin] = nil if opts["binstubs"] && opts["binstubs"].empty?
       Bundler.settings[:shebang] = opts["shebang"] if opts[:shebang]
       Bundler.settings[:no_prune] = true if opts["no-prune"]
       Bundler.settings[:disable_shared_gems] = Bundler.settings[:path] ? '1' : nil
diff --git a/spec/runtime/executable_spec.rb b/spec/runtime/executable_spec.rb
index bafa6310c7..34d5bba7c9 100644
--- a/spec/runtime/executable_spec.rb
+++ b/spec/runtime/executable_spec.rb
@@ -99,6 +99,18 @@ describe "Running bin/* commands" do
     expect(bundled_app("bin/rackup")).not_to exist
   end
 
+  it "allows you to stop installing binstubs" do
+    bundle "install --binstubs bin/"
+    bundled_app("bin/rackup").rmtree
+    bundle "install --binstubs \"\""
+
+    expect(bundled_app("bin/rackup")).not_to exist
+    #expect(bundled_app("rackup")).not_to exist
+
+    bundle "config bin"
+    expect(out).to include("You have not configured a value for `bin`")
+  end
+
   it "remembers that the option was specified" do
     gemfile <<-G
       source "file://#{gem_repo1}"