Browse files

stripping spaces in databases.yml existense check

  • Loading branch information...
1 parent ea33dc7 commit 93232a17a476f7fafd735d00bbc6115882c39e61 @everzet committed Jun 15, 2010
Showing with 3 additions and 3 deletions.
  1. +3 −3 lib/capifony.rb
View
6 lib/capifony.rb
@@ -270,9 +270,9 @@ def load_database_config(data, env)
namespace :doctrine do
desc "Ensure Doctrine is correctly configured"
task :setup do
- conf_files_exists = capture("if test -s #{shared_path}/config/databases.yml ; then echo 'exists' ; fi")
+ conf_files_exists = capture("if test -s #{shared_path}/config/databases.yml ; then echo 'exists' ; fi").strip
if (!conf_files_exists.eql?("exists"))
- symfony.configure.database
+ symfony.configure.database
end
end
@@ -323,7 +323,7 @@ def load_database_config(data, env)
desc "Ensure Propel is correctly configured"
task :setup do
shared_files << "config/propel.ini"
- conf_files_exists = capture("if test -s #{shared_path}/config/propel.ini -a -s #{shared_path}/config/databases.yml ; then echo 'exists' ; fi")
+ conf_files_exists = capture("if test -s #{shared_path}/config/propel.ini -a -s #{shared_path}/config/databases.yml ; then echo 'exists' ; fi").strip
if (!conf_files_exists.eql?("exists"))
run "cp #{symfony_lib}/plugins/sfPropelPlugin/config/skeleton/config/propel.ini #{shared_path}/config/propel.ini" ;
deploy.share_childs

0 comments on commit 93232a1

Please sign in to comment.