diff options
| author | Carl Lerche <carllerche@mac.com> | 2010-03-03 15:38:22 -0800 |
|---|---|---|
| committer | Carl Lerche <carllerche@mac.com> | 2010-03-03 15:38:22 -0800 |
| commit | 7979da2fa894a89f2e90169e688c3887dfda5270 (patch) | |
| tree | 5d33e04c1baa90b3bf1b91e14422310c23c645b5 | |
| parent | 6f4c45199b791ac2c90aa6742f8ffbd62b02ed7b (diff) | |
| download | rails-7979da2fa894a89f2e90169e688c3887dfda5270.tar.gz rails-7979da2fa894a89f2e90169e688c3887dfda5270.tar.bz2 rails-7979da2fa894a89f2e90169e688c3887dfda5270.zip | |
Revert "In app_generator, fix hardcoded `bundle` call to derive the bundle executable name from Thor::Util.ruby_command."
This reverts commit 6f4c45199b791ac2c90aa6742f8ffbd62b02ed7b.
This breaks the tests. Please investigate.
| -rw-r--r-- | railties/lib/generators/rails/app/app_generator.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/railties/lib/generators/rails/app/app_generator.rb b/railties/lib/generators/rails/app/app_generator.rb index ccc840f81c..92e0d37436 100644 --- a/railties/lib/generators/rails/app/app_generator.rb +++ b/railties/lib/generators/rails/app/app_generator.rb @@ -178,8 +178,7 @@ module Rails::Generators end def bundle_if_dev_or_edge - bundle_command = Thor::Util.ruby_command.sub(%r[ruby(?=[^/]*$)], 'bundle') - run "#{bundle_command} install" if dev_or_edge? + run "bundle install" if dev_or_edge? end protected |