Skip to content

Commit

Permalink
Merge pull request #748 from nextcloud/stable10-backport-name-changes
Browse files Browse the repository at this point in the history
[stable10] correct name
  • Loading branch information
blizzz authored Aug 5, 2016
2 parents efe8f7d + 61b3796 commit 0e808a4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions core/Command/Maintenance/Install.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public function __construct(IConfig $config) {
protected function configure() {
$this
->setName('maintenance:install')
->setDescription('install ownCloud')
->setDescription('install Nextcloud')
->addOption('database', null, InputOption::VALUE_REQUIRED, 'Supported database type', 'sqlite')
->addOption('database-name', null, InputOption::VALUE_REQUIRED, 'Name of the database')
->addOption('database-host', null, InputOption::VALUE_REQUIRED, 'Hostname of the database', 'localhost')
Expand All @@ -77,7 +77,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {

// 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! ') {
(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;
}
}
Expand All @@ -91,7 +91,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
$this->printErrors($output, $errors);
return 1;
}
$output->writeln("ownCloud was successfully installed");
$output->writeln("Nextcloud was successfully installed");
return 0;
}

Expand Down
6 changes: 3 additions & 3 deletions lib/private/Console/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@ public function loadCommands(InputInterface $input, OutputInterface $output) {
require_once __DIR__ . '/../../../core/register_command.php';
if ($this->config->getSystemValue('installed', false)) {
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");
} 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 {
OC_App::loadApps();
foreach (\OC::$server->getAppManager()->getInstalledApps() as $app) {
Expand All @@ -107,7 +107,7 @@ public function loadCommands(InputInterface $input, OutputInterface $output) {
}
}
} 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();
if ($input->getFirstArgument() !== 'check') {
Expand Down

0 comments on commit 0e808a4

Please sign in to comment.