X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FCommand%2FInstallCommand.php;h=e134ced52b2cc5116bb97c7f6dc01bc5895d002a;hb=5ecdfcd041767c9e3244a92bb0a6cc3c3f80fea3;hp=6665f4b5b7d503ad9cab5eb81ea1bd2da3995673;hpb=015e4284f0628750e5d2ce1de27fafe964286562;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index 6665f4b5..e134ced5 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -60,7 +60,7 @@ class InstallCommand extends ContainerAwareCommand
             ->checkRequirements()
             ->setupDatabase()
             ->setupAdmin()
-            ->setupAsset()
+            ->setupConfig()
         ;
 
         $output->writeln('<info>Wallabag has been successfully installed.</info>');
@@ -227,15 +227,20 @@ class InstallCommand extends ContainerAwareCommand
 
         $em->persist($config);
 
+        $this->defaultOutput->writeln('');
+
+        return $this;
+    }
+
+    protected function setupConfig()
+    {
+        $this->defaultOutput->writeln('<info><comment>Step 4 of 4.</comment> Config setup.</info>');
+        $em = $this->getContainer()->get('doctrine.orm.entity_manager');
+
         // cleanup before insert new stuff
         $em->createQuery('DELETE FROM CraueConfigBundle:Setting')->execute();
 
         $settings = [
-            [
-                'name' => 'download_pictures',
-                'value' => '1',
-                'section' => 'entry',
-            ],
             [
                 'name' => 'carrot',
                 'value' => '1',
@@ -368,20 +373,6 @@ class InstallCommand extends ContainerAwareCommand
         return $this;
     }
 
-    protected function setupAsset()
-    {
-        $this->defaultOutput->writeln('<info><comment>Step 4 of 4.</comment> Installing assets.</info>');
-
-        $this
-            ->runCommand('assets:install')
-            ->runCommand('assetic:dump')
-        ;
-
-        $this->defaultOutput->writeln('');
-
-        return $this;
-    }
-
     /**
      * Run a command.
      *
@@ -460,7 +451,13 @@ class InstallCommand extends ContainerAwareCommand
             return false;
         }
 
-        return in_array($databaseName, $schemaManager->listDatabases());
+        try {
+            return in_array($databaseName, $schemaManager->listDatabases());
+        } catch (\Doctrine\DBAL\Exception\DriverException $e) {
+            // it means we weren't able to get database list, assume the database doesn't exist
+
+            return false;
+        }
     }
 
     /**