X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FCommand%2FInstallCommand.php;h=3873d2d366762b88241874bb27415696b0b1cca3;hb=d7b4b2c72cd1c9ad967ecfec668d5b0b9e794149;hp=035eb865575a038bd8c338c5635178c79bc702ac;hpb=f9feca5c64309a2a202258bb92ae24b7a1dbe31c;p=github%2Fwallabag%2Fwallabag.git
diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index 035eb865..3873d2d3 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -61,7 +61,6 @@ class InstallCommand extends ContainerAwareCommand
->setupDatabase()
->setupAdmin()
->setupConfig()
- ->setupAsset()
;
$output->writeln('Wallabag has been successfully installed.');
@@ -70,7 +69,7 @@ class InstallCommand extends ContainerAwareCommand
protected function checkRequirements()
{
- $this->defaultOutput->writeln('Step 1 of 5. Checking system requirements.');
+ $this->defaultOutput->writeln('Step 1 of 4. Checking system requirements.');
$rows = [];
@@ -138,7 +137,7 @@ class InstallCommand extends ContainerAwareCommand
protected function setupDatabase()
{
- $this->defaultOutput->writeln('Step 2 of 5. Setting up database.');
+ $this->defaultOutput->writeln('Step 2 of 4. Setting up database.');
// user want to reset everything? Don't care about what is already here
if (true === $this->defaultInput->getOption('reset')) {
@@ -209,7 +208,7 @@ class InstallCommand extends ContainerAwareCommand
protected function setupAdmin()
{
- $this->defaultOutput->writeln('Step 3 of 5. Administration setup.');
+ $this->defaultOutput->writeln('Step 3 of 4. Administration setup.');
$questionHelper = $this->getHelperSet()->get('question');
$question = new ConfirmationQuestion('Would you like to create a new admin user (recommended) ? (Y/n)', true);
@@ -253,13 +252,18 @@ class InstallCommand extends ContainerAwareCommand
protected function setupConfig()
{
- $this->defaultOutput->writeln('Step 4 of 5. Config setup.');
+ $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' => 'share_public',
+ 'value' => '1',
+ 'section' => 'entry',
+ ],
[
'name' => 'carrot',
'value' => '1',
@@ -331,8 +335,13 @@ class InstallCommand extends ContainerAwareCommand
'section' => 'export',
],
[
- 'name' => 'pocket_consumer_key',
- 'value' => null,
+ 'name' => 'import_with_redis',
+ 'value' => '0',
+ 'section' => 'import',
+ ],
+ [
+ 'name' => 'import_with_rabbitmq',
+ 'value' => '0',
'section' => 'import',
],
[
@@ -392,20 +401,6 @@ class InstallCommand extends ContainerAwareCommand
return $this;
}
- protected function setupAsset()
- {
- $this->defaultOutput->writeln('Step 5 of 5. Installing assets.');
-
- $this
- ->runCommand('assets:install')
- ->runCommand('assetic:dump')
- ;
-
- $this->defaultOutput->writeln('');
-
- return $this;
- }
-
/**
* Run a command.
*