Merge branch 'dev'

sendya · Aug 17, 2016 · 3594baa · 3594baa
2 parents 4ef5346 + 5d23d26
commit 3594baa
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/index.php b/index.php
@@ -167,7 +167,7 @@ function print_arr($arr) {
             echo colorize('It seems composer failed to install package', 'FAILURE') . PHP_EOL;
             break;
         }
-        echo 'Now reloading packages and config...';
+        echo 'Now reloading packages and config...'. PHP_EOL;
         $configFile = DATA_PATH . 'Config.php';
         if (!file_exists($configFile)) {
             echo 'Config Unknown... copying..' . PHP_EOL;
@@ -177,7 +177,13 @@ function print_arr($arr) {
         }
 
         @include ROOT_PATH . 'Package/autoload.php';
-        @include DATA_PATH . 'Config.php';
+        try {
+            @include DATA_PATH . 'Config.php';
+        } catch (PDOException $e) {
+            echo colorize('Database not available! Please modify ./Data/Config.php and try again', 'WARNING') . PHP_EOL;
+            break;
+        }
+
         if (Option::getConfig('ENCRYPT_KEY') == 'Please generate key and paste here') {
             Option::setConfig('ENCRYPT_KEY', Option::createKey());
         }