Skip to content

Commit

Permalink
fix(cli): do not check the data directory if not setup
Browse files Browse the repository at this point in the history
Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
  • Loading branch information
skjnldsv committed Feb 28, 2024
1 parent ae3b9cc commit f0008a3
Showing 1 changed file with 21 additions and 10 deletions.
31 changes: 21 additions & 10 deletions console.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,25 +57,36 @@ function exceptionHandler($exception) {
exit(1);
}

set_exception_handler('exceptionHandler');

$config = \OC::$server->getConfig();
set_exception_handler('exceptionHandler');

if (!function_exists('posix_getuid')) {
echo "The posix extensions are required - see https://www.php.net/manual/en/book.posix.php" . PHP_EOL;
exit(1);
}
$user = posix_getuid();
$dataDirectoryUser = fileowner($config->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data'));
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;

// Check if the data directory is available and the server is installed
$dataDirectory = $config->getSystemValueString('datadirectory', \OC::$SERVERROOT . '/data');
if ($config->getSystemValueBool('installed', false) && !file_exists($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 (file_exists($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();
if ($oldWorkingDir === false) {
echo "This script can be run from the Nextcloud root directory only." . PHP_EOL;
Expand Down

0 comments on commit f0008a3

Please sign in to comment.