1 files changed, 16 insertions, 21 deletions

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('<info>Wallabag has been successfully installed.</info>');
@@ -70,7 +69,7 @@ class InstallCommand extends ContainerAwareCommand
 
     protected function checkRequirements()
     {
-        $this->defaultOutput->writeln('<info><comment>Step 1 of 5.</comment> Checking system requirements.</info>');
+        $this->defaultOutput->writeln('<info><comment>Step 1 of 4.</comment> Checking system requirements.</info>');
 
         $rows = [];
 
@@ -138,7 +137,7 @@ class InstallCommand extends ContainerAwareCommand
 
     protected function setupDatabase()
     {
-        $this->defaultOutput->writeln('<info><comment>Step 2 of 5.</comment> Setting up database.</info>');
+        $this->defaultOutput->writeln('<info><comment>Step 2 of 4.</comment> Setting up database.</info>');
 
         // 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('<info><comment>Step 3 of 5.</comment> Administration setup.</info>');
+        $this->defaultOutput->writeln('<info><comment>Step 3 of 4.</comment> Administration setup.</info>');
 
         $questionHelper = $this->getHelperSet()->get('question');
         $question = new ConfirmationQuestion('Would you like to create a new admin user (recommended) ? (Y/n)', true);
@@ -253,7 +252,7 @@ class InstallCommand extends ContainerAwareCommand
 
     protected function setupConfig()
     {
-        $this->defaultOutput->writeln('<info><comment>Step 4 of 5.</comment> Config setup.</info>');
+        $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
@@ -261,6 +260,11 @@ class InstallCommand extends ContainerAwareCommand
 
         $settings = [
             [
+                'name' => 'share_public',
+                'value' => '1',
+                'section' => 'entry',
+            ],
+            [
                 'name' => 'carrot',
                 'value' => '1',
                 'section' => 'entry',
@@ -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('<info><comment>Step 5 of 5.</comment> Installing assets.</info>');
-
-        $this
-            ->runCommand('assets:install')
-            ->runCommand('assetic:dump')
-        ;
-
-        $this->defaultOutput->writeln('');
-
-        return $this;
-    }
-
     /**
      * Run a command.
      *