sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(cli): do not check the data directory if not setup 

Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
pull/27613/head
skjnldsv 2024-02-28 15:53:36 +07:00
parent ae3b9cce99
commit 9123d6fffe
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
console.php
Unescape Escape View File

@ -57,16 +57,26 @@ 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);
} }
// Check if the data directory is available and the server is installed
$dataDirectory = $config->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data');
if ($config->getSystemValueBool('installed', false) && !is_dir($dataDirectory)) {
echo "Data directory (" . $dataDirectory . ") not found" . PHP_EOL;
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(); $user = posix_getuid();
$dataDirectoryUser = fileowner($config->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data')); $dataDirectoryUser = fileowner($dataDirectory);
if ($user !== $dataDirectoryUser) { if ($user !== $dataDirectoryUser) {
echo "Console has to be executed with the user that owns the data directory" . PHP_EOL; echo "Console has to be executed with the user that owns the data directory" . PHP_EOL;
echo "Current user id: " . $user . PHP_EOL; echo "Current user id: " . $user . PHP_EOL;
@ -75,6 +85,7 @@ try {
echo "If running with 'docker exec' try adding the option '-u " . $dataDirectoryUser . "' to the docker 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);
} }
}
$oldWorkingDir = getcwd(); $oldWorkingDir = getcwd();
if ($oldWorkingDir === false) { if ($oldWorkingDir === false) {