Move CAN_INSTALL check to method and remove unlink from SetupController

Move the check for the CAN_INSTALL file in the config directory to a method in the Setup class and remove the call to unlink from the SetupController as this in now handled in the Setup class.

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

Author: alexharpin

core/Controller/SetupController.php

@@ -59,7 +59,7 @@ public function run(array $post): void {
 			$post['dbpass'] = $post['dbpassword'];
 		}
 
-		if (!is_file(\OC::$configDir.'/CAN_INSTALL')) {
+		if (!$this->setupHelper->canInstallExists()) {
 			$this->displaySetupForbidden();
 			return;
 		}
@@ -107,10 +107,8 @@ private function finishSetup() {
 		}
 		\OC::$server->getIntegrityCodeChecker()->runInstanceVerification();
 
-		if (\OC_Util::getChannel() !== 'git' && is_file(\OC::$configDir.'/CAN_INSTALL')) {
-			if (!unlink(\OC::$configDir.'/CAN_INSTALL')) {
-				\OC_Template::printGuestPage('', 'installation_incomplete');
-			}
+		if ($this->setupHelper->canInstallExists()) {
+			\OC_Template::printGuestPage('', 'installation_incomplete');
 		}
 
 		header('Location: ' . \OC::$server->getURLGenerator()->getAbsoluteURL('index.php/core/apps/recommended'));

lib/private/Setup.php

@@ -419,7 +419,7 @@ public function install($options) {
 
 			//and we are done
 			$config->setSystemValue('installed', true);
-			if (\OC_Util::getChannel() !== 'git' && is_file(\OC::$configDir.'/CAN_INSTALL')) {
+			if (self::canInstallExists()) {
 				unlink(\OC::$configDir.'/CAN_INSTALL');
 			}
 
@@ -599,4 +599,11 @@ private function getVendorData(): array {
 			'channel' => (string)$OC_Channel,
 		];
 	}
+
+	/**
+	 * @return bool
+	 */
+	public function canInstallExists() {
+		return \OC_Util::getChannel() !== 'git' && is_file(\OC::$configDir.'/CAN_INSTALL');
+	}
 }