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

diff --git a/console.php b/console.php
index dd2c1026e477ef1d345062517204db0d712961db..55bae7a6b38b5679f8936ae83a2f0579b7f7fc96 100644 (file)
--- a/console.php
+++ b/console.php
@@ -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);
-}
+       // 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);
-}
+       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();
+       // 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;
+       $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();