Rename canInstallExists method and add new method for removal

Rename canInstallExists to shouldRemoveCanInstallFile to cover removal of this file for non-git channels and logging any failure to remove it.

Add new method to detect if this file exists during web based installation.

Signed-off-by: Alex Harpin <development@landsofshadow.co.uk>

diff --git a/core/Command/Maintenance/Install.php b/core/Command/Maintenance/Install.php
index c06cffe7dfc408951836cc464b6ed18088a96708..d53cd867b066363c151d96d8c79581faf3cc5c8a 100644 (file)
--- a/core/Command/Maintenance/Install.php
+++ b/core/Command/Maintenance/Install.php
@@ -107,7 +107,7 @@ class Install extends Command {
                        $this->printErrors($output, $errors);
                        return 1;
                }
-               if ($setupHelper->canInstallExists()) {
+               if ($setupHelper->shouldRemoveCanInstallFile()) {
                        $output->writeln('<warn>Could not remove CAN_INSTALL from the config folder. Please remove this file manually.</warn>');
                }
                $output->writeln("Nextcloud was successfully installed");

diff --git a/core/Controller/SetupController.php b/core/Controller/SetupController.php
index b4f41b48da2acd0127209ef7d77f4664fb0b0f58..cdab39edf8438804c96727b7af0778d49942c9e0 100644 (file)
--- a/core/Controller/SetupController.php
+++ b/core/Controller/SetupController.php
@@ -59,7 +59,7 @@ class SetupController {
                        $post['dbpass'] = $post['dbpassword'];
                }
 
-               if (!$this->setupHelper->canInstallExists()) {
+               if (!$this->setupHelper->canInstallFileExists()) {
                        $this->displaySetupForbidden();
                        return;
                }
@@ -107,7 +107,7 @@ class SetupController {
                }
                \OC::$server->getIntegrityCodeChecker()->runInstanceVerification();
 
-               if ($this->setupHelper->canInstallExists()) {
+               if ($this->setupHelper->shouldRemoveCanInstallFile()) {
                        \OC_Template::printGuestPage('', 'installation_incomplete');
                }
 

diff --git a/lib/private/Setup.php b/lib/private/Setup.php
index bd17698467827c2940632339311586e644b6f9b3..e84a5e4987aaeebc5abf3f10292b346534a9cac7 100644 (file)
--- a/lib/private/Setup.php
+++ b/lib/private/Setup.php
@@ -419,7 +419,7 @@ class Setup {
 
                        //and we are done
                        $config->setSystemValue('installed', true);
-                       if (self::canInstallExists()) {
+                       if (self::shouldRemoveCanInstallFile()) {
                                unlink(\OC::$configDir.'/CAN_INSTALL');
                        }
 
@@ -603,7 +603,14 @@ class Setup {
        /**
         * @return bool
         */
-       public function canInstallExists() {
+       public function shouldRemoveCanInstallFile() {
                return \OC_Util::getChannel() !== 'git' && is_file(\OC::$configDir.'/CAN_INSTALL');
        }
+
+       /**
+        * @return bool
+        */
+       public function canInstallFileExists() {
+               return is_file(\OC::$configDir.'/CAN_INSTALL');
+       }
 }