diff --git a/core/command/upgrade.php b/core/command/upgrade.php
new file mode 100644
index 0000000000000000000000000000000000000000..1d105b67a0684ad9daeb6c41828214fd1cabb618
--- /dev/null
+++ b/core/command/upgrade.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright (c) 2013 Owen Winkler <ringmaster@midnightcircus.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Core\Command;
+
+use OC\Updater;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class Upgrade extends Command {
+
+ const ERROR_SUCCESS = 0;
+ const ERROR_NOT_INSTALLED = 1;
+ const ERROR_MAINTENANCE_MODE = 2;
+ const ERROR_UP_TO_DATE = 3;
+
+ protected function configure() {
+ $this
+ ->setName('upgrade')
+ ->setDescription('run upgrade routines')
+ ;
+ }
+
+ protected function execute(InputInterface $input, OutputInterface $output) {
+ global $RUNTIME_NOAPPS;
+
+ $RUNTIME_NOAPPS = true; //no apps, yet
+
+ require_once \OC::$SERVERROOT . '/lib/base.php';
+
+ // Don't do anything if ownCloud has not been installed
+ if(!\OC_Config::getValue('installed', false)) {
+ $output->writeln('<error>ownCloud has not yet been installed</error>');
+ return self::ERROR_NOT_INSTALLED;
+ }
+
+ if(\OC::checkUpgrade(false)) {
+ $updater = new Updater();
+
+ $updater->listen('\OC\Updater', 'maintenanceStart', function () use($output) {
+ $output->writeln('<info>Turned on maintenance mode</info>');
+ });
+ $updater->listen('\OC\Updater', 'maintenanceEnd', function () use($output) {
+ $output->writeln('<info>Turned off maintenance mode</info>');
+ $output->writeln('<info>Update successful</info>');
+ });
+ $updater->listen('\OC\Updater', 'dbUpgrade', function () use($output) {
+ $output->writeln('<info>Updated database</info>');
+ });
+ $updater->listen('\OC\Updater', 'filecacheStart', function () use($output) {
+ $output->writeln('<info>Updating filecache, this may take really long...</info>');
+ });
+ $updater->listen('\OC\Updater', 'filecacheDone', function () use($output) {
+ $output->writeln('<info>Updated filecache</info>');
+ });
+ $updater->listen('\OC\Updater', 'filecacheProgress', function ($out) use($output) {
+ $output->writeln('... ' . $out . '% done ...');
+ });
+
+ $updater->listen('\OC\Updater', 'failure', function ($message) use($output) {
+ $output->writeln($message);
+ \OC_Config::setValue('maintenance', false);
+ });
+
+ $updater->upgrade();
+ return self::ERROR_SUCCESS;
+ } else if(\OC_Config::getValue('maintenance', false)) {
+ //Possible scenario: ownCloud core is updated but an app failed
+ $output->writeln('<warning>ownCloud is in maintenance mode</warning>');
+ $output->write('<comment>Maybe an upgrade is already in process. Please check the '
+ . 'logfile (data/owncloud.log). If you want to re-run the '
+ . 'upgrade procedure, remove the "maintenance mode" from '
+ . 'config.php and call this script again.</comment>'
+ , true);
+ return self::ERROR_MAINTENANCE_MODE;
+ } else {
+ $output->writeln('<info>ownCloud is already latest version</info>');
+ return self::ERROR_UP_TO_DATE;
+ }
+ }
+}
diff --git a/core/register_command.php b/core/register_command.php
index 683e7ae18337e8f5a1a2d15636f9ab707951a0d0..cfea1a6b8886442f50229c0370e1e19e1667fc8c 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -9,3 +9,4 @@
/** @var $application Symfony\Component\Console\Application */
$application->add(new OC\Core\Command\Status);
$application->add(new OC\Core\Command\Db\GenerateChangeScript());
+$application->add(new OC\Core\Command\Upgrade());
diff --git a/upgrade.php b/upgrade.php
deleted file mode 100644
index 518b514cd8a61de61b6a93059c9da6c60ca60726..0000000000000000000000000000000000000000
--- a/upgrade.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/**
-* ownCloud
-*
-* @author Arthur Schiwon
-* @copyright 2013 Arthur Schiwon blizzz@owncloud.com
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library. If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-$RUNTIME_NOAPPS = true; //no apps, yet
-
-require_once 'lib/base.php';
-
-// Don't do anything if ownCloud has not been installed
-if(!OC_Config::getValue('installed', false)) {
- exit(0);
-}
-
-$br = OC::$CLI ? PHP_EOL : '<br/>';
-
-if(OC::checkUpgrade(false)) {
- $updater = new \OC\Updater();
-
- $updater->listen('\OC\Updater', 'maintenanceStart', function () use ($br) {
- echo 'Turned on maintenance mode'.$br;
- });
- $updater->listen('\OC\Updater', 'maintenanceEnd', function () use ($br) {
- echo 'Turned off maintenance mode'.$br;
- echo 'Update successful'.$br;
- });
- $updater->listen('\OC\Updater', 'dbUpgrade', function () use ($br) {
- echo 'Updated database'.$br;
- });
- $updater->listen('\OC\Updater', 'filecacheStart', function () use ($br) {
- echo 'Updating filecache, this may take really long...'.$br;
- });
- $updater->listen('\OC\Updater', 'filecacheDone', function () use ($br) {
- echo 'Updated filecache'.$br;
- });
- $updater->listen('\OC\Updater', 'filecacheProgress', function ($out)
- use ($br) {
- echo '... ' . $out . '% done ...'.$br;
- });
-
- $updater->listen('\OC\Updater', 'failure', function ($message) use ($br) {
- echo $message.$br;
- OC_Config::setValue('maintenance', false);
- });
-
- $updater->upgrade();
-} else {
- if(OC_Config::getValue('maintenance', false)) {
- //Possible scenario: ownCloud core is updated but an app failed
- echo 'ownCloud is in maintenance mode'.$br;
- echo 'Maybe an upgrade is already in process. Please check the '
- . 'logfile (data/owncloud.log). If you want to re-run the '
- . 'upgrade procedure, remove the "maintenance mode" from '
- . 'config.php and call this script again.'
- .$br;
- } else {
- echo 'ownCloud is already latest version'.$br;
- }
-}