From 7979da2fa894a89f2e90169e688c3887dfda5270 Mon Sep 17 00:00:00 2001
From: Carl Lerche <carllerche@mac.com>
Date: Wed, 3 Mar 2010 15:38:22 -0800
Subject: 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.
---
railties/lib/generators/rails/app/app_generator.rb | 3 +--
1 file changed, 1 insertion(+), 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
--
cgit v1.2.3