diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-09 11:12:53 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-09 11:12:53 +0100 |
| commit | ff656e31f1e8de777c7cc2c0163758eb798de0e8 (patch) | |
| tree | 8e0486cdb2c6c80896596bc8c32bb71c8bc3f18f | |
| parent | 51b5498be8b5b29d28922563f301362d936f3be5 (diff) | |
| parent | d39b018893c3ed9c85724cbaa7b7e2077d80800f (diff) | |
| download | nextcloud-server-ff656e31f1e8de777c7cc2c0163758eb798de0e8.tar.gz nextcloud-server-ff656e31f1e8de777c7cc2c0163758eb798de0e8.zip | |
Merge pull request #21064 from owncloud/fix-occ-install-on-os-x
Allow occ install on OS X - same behaviour as web setup
| -rw-r--r-- | core/command/maintenance/install.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/command/maintenance/install.php b/core/command/maintenance/install.php index b0235c518ec..d4ef72c9fc8 100644 --- a/core/command/maintenance/install.php +++ b/core/command/maintenance/install.php @@ -68,7 +68,12 @@ class Install extends Command { $errors = $sysInfo['errors']; if (count($errors) > 0) { $this->printErrors($output, $errors); - return 1; + + // ignore the OS X setup warning + if(count($errors) !== 1 || + (string)($errors[0]['error']) !== 'Mac OS X is not supported and ownCloud will not work properly on this platform. Use it at your own risk! ') { + return 1; + } } // validate user input |