diff options
Diffstat (limited to 'cli/do-install.php')
| -rwxr-xr-x | cli/do-install.php | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/cli/do-install.php b/cli/do-install.php index 74bbdfcd4..4ebba0469 100755 --- a/cli/do-install.php +++ b/cli/do-install.php @@ -1,7 +1,6 @@ #!/usr/bin/php <?php -require('_cli.php'); -require(LIB_PATH . '/lib_install.php'); +require(__DIR__ . '/_cli.php'); if (!file_exists(DATA_PATH . '/do-install.txt')) { fail('FreshRSS looks to be already installed! Please use `./cli/reconfigure.php` instead.'); @@ -66,19 +65,7 @@ foreach ($dBparams as $dBparam) { } } -$requirements = checkRequirements($config['db']['type']); -if ($requirements['all'] !== 'ok') { - $message = 'FreshRSS install failed requirements:' . "\n"; - foreach ($requirements as $requirement => $check) { - if ($check !== 'ok' && !in_array($requirement, array('all', 'pdo', 'message'))) { - $message .= '• ' . $requirement . "\n"; - } - } - if (!empty($requirements['message'])) { - $message .= '• ' . $requirements['message'] . "\n"; - } - fail($message); -} +performRequirementCheck($config['db']['type']); if (!FreshRSS_user_Controller::checkUsername($options['default_user'])) { fail('FreshRSS error: invalid default username “' . $options['default_user'] |