Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions core/Command/Maintenance/Install.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
$errors = $sysInfo['errors'];
if (count($errors) > 0) {
$this->printErrors($output, $errors);

// ignore the OS X setup warning
if (count($errors) !== 1
|| (string)$errors[0]['error'] !== 'Mac OS X is not supported and Nextcloud will not work properly on this platform. Use it at your own risk!') {
return 1;
}
return 1;
}

// validate user input
Expand Down
5 changes: 2 additions & 3 deletions lib/private/Setup.php
Original file line number Diff line number Diff line change
Expand Up @@ -186,11 +186,10 @@ public function getSystemInfo(bool $allowAllDatabases = false): array {
}

// Check if running directly on macOS (note: Linux containers on macOS will not trigger this)
if (PHP_OS_FAMILY === 'Darwin') {
if (!getenv('CI') && PHP_OS_FAMILY === 'Darwin') {
$errors[] = [
'error' => $this->l10n->t(
'macOS is not supported and %s will not work properly on this platform. '
. 'Use it at your own risk!',
'macOS is not supported and %s will not work properly on this platform.',
[$this->defaults->getProductName()]
),
'hint' => $this->l10n->t('For the best results, please consider using a GNU/Linux server instead.'),
Expand Down
Loading