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

Merge pull request #8634 from owncloud/handle-excpetions-in-console-master 

Handle excpetions in console master
This commit is contained in:
Thomas Müller 2014-05-22 10:30:33 +02:00
parent 25ecd2bdda 58e22cefaf
commit 0249c6d8c7
2 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
console.php
View File

@ -8,29 +8,34 @@
use Symfony\Component\Console\Application;
require_once 'lib/base.php';
try {
require_once 'lib/base.php';
// Don't do anything if ownCloud has not been installed yet
if (!OC_Config::getValue('installed', false)) {
echo "Console can only be used once ownCloud has been installed" . PHP_EOL;
exit(0);
}
if (!OC::$CLI) {
echo "This script can be run from the command line only" . PHP_EOL;
exit(0);
}
// load all apps to get all api routes properly setup
OC_App::loadApps();
$defaults = new OC_Defaults;
$application = new Application($defaults->getName(), \OC_Util::getVersionString());
require_once 'core/register_command.php';
foreach(OC_App::getAllApps() as $app) {
$file = OC_App::getAppPath($app).'/appinfo/register_command.php';
if(file_exists($file)) {
require $file;
// Don't do anything if ownCloud has not been installed yet
if (!\OC::$server->getConfig()->getSystemValue('installed', false)) {
echo "Console can only be used once ownCloud has been installed" . PHP_EOL;
exit(0);
}
if (!OC::$CLI) {
echo "This script can be run from the command line only" . PHP_EOL;
exit(0);
}
// load all apps to get all api routes properly setup
OC_App::loadApps();
$defaults = new OC_Defaults;
$application = new Application($defaults->getName(), \OC_Util::getVersionString());
require_once 'core/register_command.php';
foreach(OC_App::getAllApps() as $app) {
$file = OC_App::getAppPath($app).'/appinfo/register_command.php';
if(file_exists($file)) {
require $file;
}
}
$application->run();
} catch (Exception $ex) {
echo "An unhandled exception has been thrown:" . PHP_EOL;
echo $ex;
}
$application->run();

2
core/command/maintenance/repair.php
View File

@ -29,7 +29,7 @@ class Repair extends Command {
protected function configure() {
$this
->setName('maintenance:repair')
->setDescription('set single user mode');
->setDescription('repair this installation');
}
protected function execute(InputInterface $input, OutputInterface $output) {