Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
die_coolen_jungs
our_own_cloud_project
Commits
e1a7523a
Commit
e1a7523a
authored
Oct 20, 2016
by
Jörn Friedrich Dreyer
Browse files
add upgrade command before repair, handle NeedsUpgradeExcaption better
parent
20a3f500
Changes
2
Hide whitespace changes
Inline
Side-by-side
core/register_command.php
View file @
e1a7523a
...
...
@@ -121,13 +121,13 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
$application
->
add
(
new
OC\Core\Command\Maintenance\Mimetype\UpdateDB
(
\
OC
::
$server
->
getMimeTypeDetector
(),
\
OC
::
$server
->
getMimeTypeLoader
()));
$application
->
add
(
new
OC\Core\Command\Maintenance\Mimetype\UpdateJS
(
\
OC
::
$server
->
getMimeTypeDetector
()));
$application
->
add
(
new
OC\Core\Command\Maintenance\Mode
(
\
OC
::
$server
->
getConfig
()));
$application
->
add
(
new
OC\Core\Command\Maintenance\Repair
(
new
\
OC\Repair
(
\
OC\Repair
::
getRepairSteps
(),
\
OC
::
$server
->
getEventDispatcher
()),
\
OC
::
$server
->
getConfig
(),
\
OC
::
$server
->
getEventDispatcher
()));
$application
->
add
(
new
OC\Core\Command\Maintenance\SingleUser
(
\
OC
::
$server
->
getConfig
()));
$application
->
add
(
new
OC\Core\Command\Maintenance\UpdateHtaccess
());
$application
->
add
(
new
OC\Core\Command\Upgrade
(
\
OC
::
$server
->
getConfig
(),
\
OC
::
$server
->
getLogger
()));
$application
->
add
(
new
OC\Core\Command\Maintenance\Repair
(
new
\
OC\Repair
(
\
OC\Repair
::
getRepairSteps
(),
\
OC
::
$server
->
getEventDispatcher
()),
\
OC
::
$server
->
getConfig
(),
\
OC
::
$server
->
getEventDispatcher
()));
$application
->
add
(
new
OC\Core\Command\User\Add
(
\
OC
::
$server
->
getUserManager
(),
\
OC
::
$server
->
getGroupManager
()));
$application
->
add
(
new
OC\Core\Command\User\Delete
(
\
OC
::
$server
->
getUserManager
()));
...
...
lib/private/Console/Application.php
View file @
e1a7523a
...
...
@@ -25,6 +25,7 @@
*/
namespace
OC\Console
;
use
OC\NeedsUpdateException
;
use
OC_App
;
use
OC_Defaults
;
use
OCP\AppFramework\QueryException
;
...
...
@@ -85,36 +86,40 @@ class Application {
if
(
$input
->
getOption
(
'no-warnings'
))
{
$output
->
setVerbosity
(
OutputInterface
::
VERBOSITY_QUIET
);
}
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
(
"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"
);
}
else
{
OC_App
::
loadApps
();
foreach
(
\
OC
::
$server
->
getAppManager
()
->
getInstalledApps
()
as
$app
)
{
$appPath
=
\
OC_App
::
getAppPath
(
$app
);
if
(
$appPath
===
false
)
{
continue
;
}
// load commands using info.xml
$info
=
\
OC_App
::
getAppInfo
(
$app
);
if
(
isset
(
$info
[
'commands'
]))
{
$this
->
loadCommandsFromInfoXml
(
$info
[
'commands'
]);
}
// load from register_command.php
\
OC_App
::
registerAutoloading
(
$app
,
$appPath
);
$file
=
$appPath
.
'/appinfo/register_command.php'
;
if
(
file_exists
(
$file
))
{
require
$file
;
try
{
require_once
__DIR__
.
'/../../../core/register_command.php'
;
if
(
$this
->
config
->
getSystemValue
(
'installed'
,
false
))
{
if
(
\
OCP\Util
::
needUpgrade
())
{
throw
new
NeedsUpdateException
();
}
elseif
(
$this
->
config
->
getSystemValue
(
'maintenance'
,
false
))
{
$output
->
writeln
(
"ownCloud is in maintenance mode - no app have been loaded"
);
}
else
{
OC_App
::
loadApps
();
foreach
(
\
OC
::
$server
->
getAppManager
()
->
getInstalledApps
()
as
$app
)
{
$appPath
=
\
OC_App
::
getAppPath
(
$app
);
if
(
$appPath
===
false
)
{
continue
;
}
// load commands using info.xml
$info
=
\
OC_App
::
getAppInfo
(
$app
);
if
(
isset
(
$info
[
'commands'
]))
{
$this
->
loadCommandsFromInfoXml
(
$info
[
'commands'
]);
}
// load from register_command.php
\
OC_App
::
registerAutoloading
(
$app
,
$appPath
);
$file
=
$appPath
.
'/appinfo/register_command.php'
;
if
(
file_exists
(
$file
))
{
require
$file
;
}
}
}
}
else
{
$output
->
writeln
(
"ownCloud is not installed - only a limited number of commands are available"
);
}
}
else
{
$output
->
writeln
(
"ownCloud is not installed - only a limited number of commands are available"
);
}
}
catch
(
NeedsUpdateException
$ex
)
{
$output
->
writeln
(
"ownCloud 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"
);
};
$input
=
new
ArgvInput
();
if
(
$input
->
getFirstArgument
()
!==
'check'
)
{
$errors
=
\
OC_Util
::
checkServer
(
\
OC
::
$server
->
getConfig
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment