X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FCommand%2FInstallCommand.php;h=143def4f158ea572ad871db1fbbbc2316df3e1e1;hb=d0545b6bd6edc38bf06604900b1e20a60e7c8583;hp=6665f4b5b7d503ad9cab5eb81ea1bd2da3995673;hpb=77b9db87b84e20a6042444e3b18665bc66d4f1f2;p=github%2Fwallabag%2Fwallabag.git
diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index 6665f4b5..143def4f 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('Wallabag has been successfully installed.');
@@ -227,12 +227,22 @@ class InstallCommand extends ContainerAwareCommand
$em->persist($config);
+ $this->defaultOutput->writeln('');
+
+ return $this;
+ }
+
+ protected function setupConfig()
+ {
+ $this->defaultOutput->writeln('Step 4 of 4. Config setup.');
+ $em = $this->getContainer()->get('doctrine.orm.entity_manager');
+
// cleanup before insert new stuff
$em->createQuery('DELETE FROM CraueConfigBundle:Setting')->execute();
$settings = [
[
- 'name' => 'download_pictures',
+ 'name' => 'share_public',
'value' => '1',
'section' => 'entry',
],
@@ -368,20 +378,6 @@ class InstallCommand extends ContainerAwareCommand
return $this;
}
- protected function setupAsset()
- {
- $this->defaultOutput->writeln('Step 4 of 4. Installing assets.');
-
- $this
- ->runCommand('assets:install')
- ->runCommand('assetic:dump')
- ;
-
- $this->defaultOutput->writeln('');
-
- return $this;
- }
-
/**
* Run a command.
*
@@ -460,7 +456,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;
+ }
}
/**