aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2012-12-28 14:20:27 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2012-12-28 14:21:24 -0700
commita79300a0d80940b457a5065803486526d6bf89a1 (patch)
tree50069202daef83d271d144cddead3d3b865388c3 /railties/lib/rails/generators
parent427544ed45ff8dccc4c94065ce243806189b282e (diff)
downloadrails-a79300a0d80940b457a5065803486526d6bf89a1.tar.gz
rails-a79300a0d80940b457a5065803486526d6bf89a1.tar.bz2
rails-a79300a0d80940b457a5065803486526d6bf89a1.zip
Revert "Detect rbenv and update the shebang"
This reverts commit 7173c4f931c9026bd3bc0b644d93dae744433f09. This reverts commit a562f9fa09967eba26dff1c3bc8aa85b6f0a72ff.
Diffstat (limited to 'railties/lib/rails/generators')
-rw-r--r--railties/lib/rails/generators/app_base.rb9
1 files changed, 1 insertions, 8 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 9b9ae72e18..9874fb462a 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -261,14 +261,7 @@ module Rails
end
def run_bundle
- command = "install --binstubs"
- command << " --shebang ruby-local-exec" if detect_ruby_local_exec
-
- bundle_command(command) unless options[:skip_gemfile] || options[:skip_bundle] || options[:pretend]
- end
-
- def detect_ruby_local_exec
- ENV["PATH"].split(":").find { |path| File.file?(File.join(path, "ruby-local-exec")) }
+ bundle_command('install --binstubs') unless options[:skip_gemfile] || options[:skip_bundle] || options[:pretend]
end
def empty_directory_with_keep_file(destination, config = {})