Merge branch 'develop'

OFFLINE-GmbH · Aug 10, 2016 · f8ed1ed · f8ed1ed
2 parents 6945774 + 674bc71
commit f8ed1ed
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/october b/october
@@ -8,7 +8,7 @@ if (file_exists(__DIR__.'/../../autoload.php')) {
     require __DIR__.'/vendor/autoload.php';
 }
 
-$app = new Symfony\Component\Console\Application('October CMS Bootstrapper', '0.2.2');
+$app = new Symfony\Component\Console\Application('October CMS Bootstrapper', '0.2.3');
 $app->add(new \OFFLINE\Bootstrapper\October\Console\InitCommand);
 $app->add(new \OFFLINE\Bootstrapper\October\Console\InstallCommand);
 $app->run();
diff --git a/src/Console/InstallCommand.php b/src/Console/InstallCommand.php
@@ -167,12 +167,14 @@ protected function execute(InputInterface $input, OutputInterface $output)
      */
     protected function writeConfig($force = false)
     {
+        $setup = new Setup($this->config, $this->output);
+        $setup->config();
+
         if ( ! $this->firstRun || (file_exists(getcwd() . DS . '.env') && $force === false)) {
             return $this->output->writeln('<comment>-> Configuration already set up. Use --force to regenerate.</comment>');
         }
 
-        $setup = new Setup($this->config, $this->output);
-        $setup->env()->config();
+        $setup->env();
     }
 
     /**