Only remove when not on git channel

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
nextcloud · Apr 8, 2019 · 98ed0ad · 98ed0ad
1 parent 1c53c45
commit 98ed0ad
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,6 @@
 /config/*.config.php
 /config/mimetype*.json
 /config/mount.php
-/config/CAN_INSTALL
 /apps/inc.php
 /assets
 /.htaccess

diff --git a/core/Controller/SetupController.php b/core/Controller/SetupController.php
@@ -111,7 +111,7 @@ public function finishSetup() {
 		}
 		\OC::$server->getIntegrityCodeChecker()->runInstanceVerification();
 
-		if (is_file(\OC::$configDir.'/CAN_INSTALL')) {
+		if (\OC_Util::getChannel() !== 'git' && is_file(\OC::$configDir.'/CAN_INSTALL')) {
 			unlink(\OC::$configDir.'/CAN_INSTALL');
 		}
 

diff --git a/lib/private/Updater.php b/lib/private/Updater.php
@@ -111,8 +111,10 @@ public function upgrade() {
 			$this->emit('\OC\Updater', 'maintenanceEnabled');
 		}
 
-		// Clear CAN_INSTALL file
-		unlink(\OC::$configDir.'/CAN_INSTALL');
+		// Clear CAN_INSTALL file if not on git
+		if (\OC_Util::getChannel() !== 'git') {
+			unlink(\OC::$configDir . '/CAN_INSTALL');
+		}
 
 		$installedVersion = $this->config->getSystemValue('version', '0.0.0');
 		$currentVersion = implode('.', \OCP\Util::getVersion());