expand toplevel method definition about stub file detection

1 files changed, 7 insertions, 6 deletions

diff --git a/lib/bundler/templates/Executable b/lib/bundler/templates/Executable
index 6a022c2506..414a75898d 100755
--- a/lib/bundler/templates/Executable
+++ b/lib/bundler/templates/Executable
@@ -12,16 +12,17 @@ require "pathname"
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../<%= relative_gemfile_path %>",
   Pathname.new(__FILE__).realpath)
 
-def bundle_stub?(path)
-    return false unless File.file?(path)
-    return true if File.read(path, 150) =~ /This file was generated by Bundler/
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 150) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
     abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
 Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
 end
 
-bundle_binstub = File.expand_path("../bundle", __FILE__)
-load(bundle_binstub) if bundle_stub?(bundle_binstub)
-
 require "rubygems"
 require "bundler/setup"