mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #748 from nextcloud/stable10-backport-name-changes 

[stable10] correct name
This commit is contained in:
blizzz 2016-08-05 15:42:40 +02:00 committed by GitHub
parent efe8f7d136 61b3796ea5
commit 0e808a45b8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/Command/Maintenance/Install.php
View File

@ -50,7 +50,7 @@ class Install extends Command {
protected function configure() { protected function configure() {
$this $this
->setName('maintenance:install') ->setName('maintenance:install')
->setDescription('install ownCloud') ->setDescription('install Nextcloud')
->addOption('database', null, InputOption::VALUE_REQUIRED, 'Supported database type', 'sqlite') ->addOption('database', null, InputOption::VALUE_REQUIRED, 'Supported database type', 'sqlite')
->addOption('database-name', null, InputOption::VALUE_REQUIRED, 'Name of the database') ->addOption('database-name', null, InputOption::VALUE_REQUIRED, 'Name of the database')
->addOption('database-host', null, InputOption::VALUE_REQUIRED, 'Hostname of the database', 'localhost') ->addOption('database-host', null, InputOption::VALUE_REQUIRED, 'Hostname of the database', 'localhost')
@ -77,7 +77,7 @@ class Install extends Command {
// ignore the OS X setup warning // ignore the OS X setup warning
if(count($errors) !== 1 || 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! ') { (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;
} }
} }
@ -91,7 +91,7 @@ class Install extends Command {
$this->printErrors($output, $errors); $this->printErrors($output, $errors);
return 1; return 1;
} }
$output->writeln("ownCloud was successfully installed"); $output->writeln("Nextcloud was successfully installed");
return 0; return 0;
} }

6
lib/private/Console/Application.php
View File

@ -88,10 +88,10 @@ class Application {
require_once __DIR__ . '/../../../core/register_command.php'; require_once __DIR__ . '/../../../core/register_command.php';
if ($this->config->getSystemValue('installed', false)) { if ($this->config->getSystemValue('installed', false)) {
if (\OCP\Util::needUpgrade()) { if (\OCP\Util::needUpgrade()) {
$output->writeln("ownCloud or one of the apps require upgrade - only a limited number of commands are available"); $output->writeln("Nextcloud or one of the apps require upgrade - only a limited number of commands are available");
$output->writeln("You may use your browser or the occ upgrade command to do the upgrade"); $output->writeln("You may use your browser or the occ upgrade command to do the upgrade");
} elseif ($this->config->getSystemValue('maintenance', false)) { } elseif ($this->config->getSystemValue('maintenance', false)) {
$output->writeln("ownCloud is in maintenance mode - no app have been loaded"); $output->writeln("Nextcloud is in maintenance mode - no app have been loaded");
} else { } else {
OC_App::loadApps(); OC_App::loadApps();
foreach (\OC::$server->getAppManager()->getInstalledApps() as $app) { foreach (\OC::$server->getAppManager()->getInstalledApps() as $app) {
@ -107,7 +107,7 @@ class Application {
} }
} }
} else { } else {
$output->writeln("ownCloud is not installed - only a limited number of commands are available"); $output->writeln("Nextcloud is not installed - only a limited number of commands are available");
} }
$input = new ArgvInput(); $input = new ArgvInput();
if ($input->getFirstArgument() !== 'check') { if ($input->getFirstArgument() !== 'check') {