Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix rake dev and related commands

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2653 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 98c1735f0313a08563d8cb92fcbff48b2be906fc 1 parent 50a02ab
@seckar seckar authored
View
2  railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fix rake dev and related commands [Nicholas Seckar]
+
* The rails command tries to deduce your MySQL socket by running `mysql_config
--socket`. If it fails, default to /path/to/your/mysql.sock
View
6 railties/Rakefile
@@ -156,7 +156,11 @@ task :copy_application do
end
task :copy_configs do
- cp "configs/database.yml", "#{PKG_DESTINATION}/config/database.yml"
+ app_name = "rails"
+ socket = nil
+ require 'erb'
+ File.open("#{PKG_DESTINATION}/config/database.yml", 'w') {|f| f.write ERB.new(IO.read("configs/database.yml")).result(binding)}
+
cp "configs/routes.rb", "#{PKG_DESTINATION}/config/routes.rb"
cp "configs/apache.conf", "#{PKG_DESTINATION}/public/.htaccess"
View
6 railties/configs/database.yml
@@ -1,7 +1,7 @@
development:
adapter: mysql
database: <%= app_name %>_development
- socket: <%= socket %>
+ <%= "socket: #{socket}" if socket %>
username: root
password:
# With the MySQL adapter on localhost, it defaults to /tmp/mysql.sock
@@ -13,13 +13,13 @@ development:
test:
adapter: mysql
database: <%= app_name %>_test
- socket: <%= socket %>
+ <%= "socket: #{socket}" if socket %>
username: root
password:
production:
adapter: mysql
database: <%= app_name %>_production
- socket: <%= socket %>
+ <%= "socket: #{socket}" if socket %>
username: root
password:

0 comments on commit 98c1735

Please sign in to comment.
Something went wrong with that request. Please try again.