adding try/catch + switch to config object as provided by the server container

This commit is contained in:
Thomas Müller 2014-05-19 15:26:57 +02:00
parent 6c4b650524
commit 6929549dad
1 changed files with 28 additions and 23 deletions

View File

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