aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/CoreBundle/Command/InstallCommand.php
diff options
context:
space:
mode:
Diffstat (limited to 'src/Wallabag/CoreBundle/Command/InstallCommand.php')
-rw-r--r--src/Wallabag/CoreBundle/Command/InstallCommand.php23
1 files changed, 4 insertions, 19 deletions
diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index 813ac720..e134ced5 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -61,7 +61,6 @@ class InstallCommand extends ContainerAwareCommand
61 ->setupDatabase() 61 ->setupDatabase()
62 ->setupAdmin() 62 ->setupAdmin()
63 ->setupConfig() 63 ->setupConfig()
64 ->setupAsset()
65 ; 64 ;
66 65
67 $output->writeln('<info>Wallabag has been successfully installed.</info>'); 66 $output->writeln('<info>Wallabag has been successfully installed.</info>');
@@ -70,7 +69,7 @@ class InstallCommand extends ContainerAwareCommand
70 69
71 protected function checkRequirements() 70 protected function checkRequirements()
72 { 71 {
73 $this->defaultOutput->writeln('<info><comment>Step 1 of 5.</comment> Checking system requirements.</info>'); 72 $this->defaultOutput->writeln('<info><comment>Step 1 of 4.</comment> Checking system requirements.</info>');
74 73
75 $fulfilled = true; 74 $fulfilled = true;
76 75
@@ -120,7 +119,7 @@ class InstallCommand extends ContainerAwareCommand
120 119
121 protected function setupDatabase() 120 protected function setupDatabase()
122 { 121 {
123 $this->defaultOutput->writeln('<info><comment>Step 2 of 5.</comment> Setting up database.</info>'); 122 $this->defaultOutput->writeln('<info><comment>Step 2 of 4.</comment> Setting up database.</info>');
124 123
125 // user want to reset everything? Don't care about what is already here 124 // user want to reset everything? Don't care about what is already here
126 if (true === $this->defaultInput->getOption('reset')) { 125 if (true === $this->defaultInput->getOption('reset')) {
@@ -191,7 +190,7 @@ class InstallCommand extends ContainerAwareCommand
191 190
192 protected function setupAdmin() 191 protected function setupAdmin()
193 { 192 {
194 $this->defaultOutput->writeln('<info><comment>Step 3 of 5.</comment> Administration setup.</info>'); 193 $this->defaultOutput->writeln('<info><comment>Step 3 of 4.</comment> Administration setup.</info>');
195 194
196 $questionHelper = $this->getHelperSet()->get('question'); 195 $questionHelper = $this->getHelperSet()->get('question');
197 $question = new ConfirmationQuestion('Would you like to create a new admin user (recommended) ? (Y/n)', true); 196 $question = new ConfirmationQuestion('Would you like to create a new admin user (recommended) ? (Y/n)', true);
@@ -235,7 +234,7 @@ class InstallCommand extends ContainerAwareCommand
235 234
236 protected function setupConfig() 235 protected function setupConfig()
237 { 236 {
238 $this->defaultOutput->writeln('<info><comment>Step 4 of 5.</comment> Config setup.</info>'); 237 $this->defaultOutput->writeln('<info><comment>Step 4 of 4.</comment> Config setup.</info>');
239 $em = $this->getContainer()->get('doctrine.orm.entity_manager'); 238 $em = $this->getContainer()->get('doctrine.orm.entity_manager');
240 239
241 // cleanup before insert new stuff 240 // cleanup before insert new stuff
@@ -374,20 +373,6 @@ class InstallCommand extends ContainerAwareCommand
374 return $this; 373 return $this;
375 } 374 }
376 375
377 protected function setupAsset()
378 {
379 $this->defaultOutput->writeln('<info><comment>Step 5 of 5.</comment> Installing assets.</info>');
380
381 $this
382 ->runCommand('assets:install')
383 ->runCommand('assetic:dump')
384 ;
385
386 $this->defaultOutput->writeln('');
387
388 return $this;
389 }
390
391 /** 376 /**
392 * Run a command. 377 * Run a command.
393 * 378 *