mirror of https://github.com/nextcloud/server
fix(cli): do not check the data directory if not setup
Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
This commit is contained in:
parent
ae3b9cce99
commit
9123d6fffe
31
console.php
31
console.php
|
@ -57,25 +57,36 @@ try {
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
set_exception_handler('exceptionHandler');
|
|
||||||
|
|
||||||
$config = \OC::$server->getConfig();
|
$config = \OC::$server->getConfig();
|
||||||
|
set_exception_handler('exceptionHandler');
|
||||||
|
|
||||||
if (!function_exists('posix_getuid')) {
|
if (!function_exists('posix_getuid')) {
|
||||||
echo "The posix extensions are required - see https://www.php.net/manual/en/book.posix.php" . PHP_EOL;
|
echo "The posix extensions are required - see https://www.php.net/manual/en/book.posix.php" . PHP_EOL;
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
$user = posix_getuid();
|
|
||||||
$dataDirectoryUser = fileowner($config->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data'));
|
// Check if the data directory is available and the server is installed
|
||||||
if ($user !== $dataDirectoryUser) {
|
$dataDirectory = $config->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data');
|
||||||
echo "Console has to be executed with the user that owns the data directory" . PHP_EOL;
|
if ($config->getSystemValueBool('installed', false) && !is_dir($dataDirectory)) {
|
||||||
echo "Current user id: " . $user . PHP_EOL;
|
echo "Data directory (" . $dataDirectory . ") not found" . PHP_EOL;
|
||||||
echo "Owner id of the data directory: " . $dataDirectoryUser . PHP_EOL;
|
|
||||||
echo "Try adding 'sudo -u #" . $dataDirectoryUser . "' to the beginning of the command (without the single quotes)" . PHP_EOL;
|
|
||||||
echo "If running with 'docker exec' try adding the option '-u " . $dataDirectoryUser . "' to the docker command (without the single quotes)" . PHP_EOL;
|
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Check if the user running the console is the same as the user that owns the data directory
|
||||||
|
// If the data directory does not exist, the server is not setup yet and we can skip.
|
||||||
|
if (is_dir($dataDirectory)) {
|
||||||
|
$user = posix_getuid();
|
||||||
|
$dataDirectoryUser = fileowner($dataDirectory);
|
||||||
|
if ($user !== $dataDirectoryUser) {
|
||||||
|
echo "Console has to be executed with the user that owns the data directory" . PHP_EOL;
|
||||||
|
echo "Current user id: " . $user . PHP_EOL;
|
||||||
|
echo "Owner id of the data directory: " . $dataDirectoryUser . PHP_EOL;
|
||||||
|
echo "Try adding 'sudo -u #" . $dataDirectoryUser . "' to the beginning of the command (without the single quotes)" . PHP_EOL;
|
||||||
|
echo "If running with 'docker exec' try adding the option '-u " . $dataDirectoryUser . "' to the docker command (without the single quotes)" . PHP_EOL;
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$oldWorkingDir = getcwd();
|
$oldWorkingDir = getcwd();
|
||||||
if ($oldWorkingDir === false) {
|
if ($oldWorkingDir === false) {
|
||||||
echo "This script can be run from the Nextcloud root directory only." . PHP_EOL;
|
echo "This script can be run from the Nextcloud root directory only." . PHP_EOL;
|
||||||
|
|
Loading…
Reference in New Issue