Remove commented out datasources config.

Use file_exists so build scripts don't have to use sed. This also means we don't have additional setup instructions.
cakephp · Nov 15, 2012 · 2e3b5e4 · 2e3b5e4
1 parent acaacbb
commit 2e3b5e4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -31,7 +31,6 @@ before_script:
     server.listen(80, 'localhost');
     console.log('TCP server listening on port 80 at localhost.');" > App/tmp/socket.js
   - sudo node ./App/tmp/socket.js &
-  - sed -i "s/\/\/ \(require __DIR__ \. '\/datasources\.php';\)/\\1/" App/Config/bootstrap.php
   - pear channel-discover pear.cakephp.org
   - pear install --alldeps cakephp/CakePHP_CodeSniffer
   - phpenv rehash

diff --git a/App/Config/bootstrap.php b/App/Config/bootstrap.php
@@ -67,7 +67,9 @@
  *
  * See App/Config/datasources.default.php for a template.
  */
-// require __DIR__ . '/datasources.php';
+if (file_exists(__DIR__ . '/datasources.php')) {
+	require __DIR__ . '/datasources.php';
+}
 
 /**
  * Load logging configuration.