Refs matomo-org#4990 More fixes to make installer bullet proof

core/Version.php

@@ -21,5 +21,5 @@ final class Version
      * The current Piwik version.
      * @var string
      */
-    const VERSION = '2.2.1-rc1';
+    const VERSION = '2.2.1-rc2';
 }

plugins/Installation/Controller.php

@@ -106,6 +106,8 @@ function systemCheck()
     {
         $this->checkPiwikIsNotInstalled();
 
+        $this->deleteConfigFileIfNeeded();
+
         $view = new View(
             '@Installation/systemCheck',
             $this->getInstallationSteps(),
@@ -154,7 +156,6 @@ function databaseSetup()
 
                 Db::get()->checkClientVersion();
 
-                $this->deleteConfigFileIfNeeded();
                 $this->createConfigFile($dbInfos);
 
                 $this->redirectToNextStep(__FUNCTION__);
@@ -208,7 +209,10 @@ function tablesCreation()
             DbHelper::createTables();
             DbHelper::createAnonymousUser();
 
+            $this->updateComponents();
+
             Updater::recordComponentSuccessfullyUpdated('core', Version::VERSION);
+
             $view->tablesCreated = true;
             $view->showNextStep = true;
         }
@@ -229,20 +233,13 @@ function reuseTables()
             'tablesCreation'
         );
 
-        Access::getInstance();
-        Piwik::setUserHasSuperUserAccess();
-
-        $updater = new Updater();
-        $componentsWithUpdateFile = CoreUpdater::getComponentUpdates($updater);
-
-        if (empty($componentsWithUpdateFile)) {
-            return $this->redirectToNextStep('tablesCreation');
+        $result = $this->updateComponents();
+        if($result === false) {
+            $this->redirectToNextStep('tablesCreation');
         }
 
         $oldVersion = Option::get('version_core');
 
-        $result = CoreUpdater::updateComponents($updater, $componentsWithUpdateFile);
-
         $view->coreError       = $result['coreError'];
         $view->warningMessages = $result['warnings'];
         $view->errorMessages   = $result['errors'];
@@ -693,4 +690,22 @@ protected function registerNewsletter($email, $newsletterSecurity, $newsletterCo
         }
     }
 
+    /**
+     * @return array|bool
+     */
+    protected function updateComponents()
+    {
+        Access::getInstance();
+        Piwik::setUserHasSuperUserAccess();
+
+        $updater = new Updater();
+        $componentsWithUpdateFile = CoreUpdater::getComponentUpdates($updater);
+
+        if (empty($componentsWithUpdateFile)) {
+            return false;
+        }
+        $result = CoreUpdater::updateComponents($updater, $componentsWithUpdateFile);
+        return $result;
+    }
+
 }