upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

Rename canInstallExists method and add new method for removal

Browse source 
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>
This commit is contained in:
Alex Harpin 2021-06-19 21:06:57 +01:00
parent d5b52ddd21
commit 644df591b1
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/Command/Maintenance/Install.php
View file

@ -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");

4
core/Controller/SetupController.php
View file

@ -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');
}

11
lib/private/Setup.php
View file

@ -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');
}
}