From c165c0be57e1c3649861a04ea4647b2bd8a9b101 Mon Sep 17 00:00:00 2001
From: Nico Stapelbroek <nstapelbroek@gmail.com>
Date: Mon, 2 Jul 2018 12:33:30 +0200
Subject: [PATCH] Merge cachet:install and app:install

---
 app/Console/Commands/AppInstallCommand.php | 76 ----------------------
 app/Console/Commands/InstallCommand.php    | 50 +++++++++++---
 2 files changed, 40 insertions(+), 86 deletions(-)
 delete mode 100644 app/Console/Commands/AppInstallCommand.php

diff --git a/app/Console/Commands/AppInstallCommand.php b/app/Console/Commands/AppInstallCommand.php
deleted file mode 100644
index 6f5a0cfe..00000000
--- a/app/Console/Commands/AppInstallCommand.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-/*
- * This file is part of Cachet.
- *
- * (c) Alt Three Services Limited
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace CachetHQ\Cachet\Console\Commands;
-
-use Illuminate\Console\Command;
-use Illuminate\Contracts\Events\Dispatcher;
-
-/**
- * This is the app install command.
- *
- * @author James Brooks <james@alt-three.com>
- */
-class AppInstallCommand extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'app:install';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Installs the application';
-
-    /**
-     * The events instance.
-     *
-     * @var \Illuminate\Contracts\Events\Dispatcher
-     */
-    protected $events;
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct(Dispatcher $events)
-    {
-        $this->events = $events;
-
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return mixed
-     */
-    public function handle()
-    {
-        $this->events->fire('command.installing', $this);
-        $this->events->fire('command.generatekey', $this);
-        $this->events->fire('command.cacheconfig', $this);
-        $this->events->fire('command.cacheroutes', $this);
-        $this->events->fire('command.publishvendors', $this);
-        $this->events->fire('command.runmigrations', $this);
-        $this->events->fire('command.runseeding', $this);
-        $this->events->fire('command.updatecache', $this);
-        $this->events->fire('command.linkstorage', $this);
-        $this->events->fire('command.extrastuff', $this);
-        $this->events->fire('command.installed', $this);
-    }
-}
diff --git a/app/Console/Commands/InstallCommand.php b/app/Console/Commands/InstallCommand.php
index aa747b49..06fd8410 100644
--- a/app/Console/Commands/InstallCommand.php
+++ b/app/Console/Commands/InstallCommand.php
@@ -14,6 +14,7 @@ namespace CachetHQ\Cachet\Console\Commands;
 use Dotenv\Dotenv;
 use Dotenv\Exception\InvalidPathException;
 use Illuminate\Console\Command;
+use Illuminate\Contracts\Events\Dispatcher;
 
 /**
  * This is the install command class.
@@ -36,6 +37,25 @@ class InstallCommand extends Command
      */
     protected $description = 'Install Cachet';
 
+    /**
+     * The events instance.
+     *
+     * @var \Illuminate\Contracts\Events\Dispatcher
+     */
+    protected $events;
+
+    /**
+     * Create a new command instance.
+     *
+     * @param Dispatcher $events
+     */
+    public function __construct(Dispatcher $events)
+    {
+        $this->events = $events;
+
+        parent::__construct();
+    }
+
     /**
      * Execute the console command.
      *
@@ -43,18 +63,28 @@ class InstallCommand extends Command
      */
     public function handle()
     {
-        if (!$this->confirm('Do you want to install Cachet?')) {
-            $this->line('Installation aborted. Goodbye!');
-
-            return;
+        if ($this->confirm('Do you want to configure Cachet before installing?')) {
+            $this->configureEnvironmentFile();
+            $this->configureKey();
+            $this->configureDatabase();
+            $this->configureDrivers();
+            $this->configureMail();
+            $this->configureCachet();
         }
 
-        $this->configureEnvironmentFile();
-        $this->configureKey();
-        $this->configureDatabase();
-        $this->configureDrivers();
-        $this->configureMail();
-        $this->configureCachet();
+        $this->line('Installing Cachet...');
+
+        $this->events->fire('command.installing', $this);
+        $this->events->fire('command.generatekey', $this);
+        $this->events->fire('command.cacheconfig', $this);
+        $this->events->fire('command.cacheroutes', $this);
+        $this->events->fire('command.publishvendors', $this);
+        $this->events->fire('command.runmigrations', $this);
+        $this->events->fire('command.runseeding', $this);
+        $this->events->fire('command.updatecache', $this);
+        $this->events->fire('command.linkstorage', $this);
+        $this->events->fire('command.extrastuff', $this);
+        $this->events->fire('command.installed', $this);
 
         $this->info('Cachet is installed ⚡');
     }