From 5abdb819475a14a724c1bbecda894823021ed5fe Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Wed, 12 Aug 2015 01:45:02 +0200 Subject: [PATCH] Use new installer --- system/bootstrap.php | 3 ++- system/flarum | 12 +++--------- system/vagrant/environment.sh | 5 ++--- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/system/bootstrap.php b/system/bootstrap.php index 96d643d..3e5e471 100644 --- a/system/bootstrap.php +++ b/system/bootstrap.php @@ -135,10 +135,11 @@ $serviceProviders = [ 'Illuminate\Validation\ValidationServiceProvider', 'Illuminate\View\ViewServiceProvider', + 'Flarum\Core\DatabaseServiceProvider', + ]; if (Core::isInstalled()) { - $serviceProviders[] = 'Flarum\Core\DatabaseServiceProvider'; $serviceProviders[] = 'Flarum\Core\Settings\SettingsServiceProvider'; $serviceProviders[] = 'Flarum\Support\ExtensionsServiceProvider'; $serviceProviders[] = 'Flarum\Core\CoreServiceProvider'; diff --git a/system/flarum b/system/flarum index ea731b2..75d4bf1 100644 --- a/system/flarum +++ b/system/flarum @@ -5,13 +5,7 @@ $app = require_once __DIR__.'/bootstrap.php'; $app->register('Flarum\Console\ConsoleServiceProvider'); -$kernel = $app->make('Illuminate\Contracts\Console\Kernel'); +$console = new \Symfony\Component\Console\Application('Flarum', '1.0-dev'); +$console->add(new \Flarum\Install\Console\InstallCommand($app)); -$status = $kernel->handle( - $input = new Symfony\Component\Console\Input\ArgvInput, - new Symfony\Component\Console\Output\ConsoleOutput -); - -$kernel->terminate($input, $status); - -exit($status); +exit($console->run()); diff --git a/system/vagrant/environment.sh b/system/vagrant/environment.sh index 91ae540..43d1219 100644 --- a/system/vagrant/environment.sh +++ b/system/vagrant/environment.sh @@ -91,6 +91,5 @@ npm install gulp cd /vagrant/system -php flarum vendor:publish -php flarum install -php flarum seed +#php flarum vendor:publish +php flarum install --defaults