strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[TASK] Auto install: Rework class

Browse source
This commit is contained in:
Marcus Müller 2018-04-18 14:30:42 +02:00 committed by GitHub
parent 24626f5fd2
commit 457b86711d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
src/Core/Console/AutomaticInstallation.php
View file

@ -16,11 +16,7 @@ class AutomaticInstallation extends Console
return <<<HELP return <<<HELP
Installation - Install Friendica automatically Installation - Install Friendica automatically
Synopsis Synopsis
bin/console install [-h|--help|-?] [-v] [-a] bin/console autoinstall [-h|--help|-?] [-v] [-a]
Description
bin/console install
Installs Friendica with data based on the htconfig.php file
Notes: Notes:
Not checking .htaccess/URL-Rewrite during CLI installation. Not checking .htaccess/URL-Rewrite during CLI installation.
@ -34,67 +30,62 @@ HELP;
protected function doExecute() protected function doExecute()
{ {
// remove die and copy config file
$fileContent = file_get_contents('./htconfig.php');
$fileContent = str_replace('die', '//die', $fileContent);
file_put_contents('.htautoinstall.php', $fileContent);
// Initialise the app // Initialise the app
$this->output("Initializing setup...\n"); $this->out("Initializing setup...\n");
$a = get_app(); $a = get_app();
$db_host = ''; $db_host = '';
$db_user = ''; $db_user = '';
$db_pass = ''; $db_pass = '';
$db_data = ''; $db_data = '';
require_once '.htautoinstall.php'; require_once 'htconfig.php';
$this->output(" Complete!\n\n"); $this->out(" Complete!\n\n");
// Check basic setup // Check basic setup
$this->output("Checking basic setup...\n"); $this->out("Checking basic setup...\n");
$checkResults = []; $checkResults = [];
$checkResults['basic'] = $this->runBasicChecks($a); $checkResults['basic'] = $this->runBasicChecks($a);
$errorMessage = $this->extractErrors($checkResults['basic']); $errorMessage = $this->extractErrors($checkResults['basic']);
if ($errorMessage !== '') { if ($errorMessage !== '') {
die($errorMessage); throw new \RuntimeException($errorMessage);
} }
$this->output(" Complete!\n\n"); $this->out(" Complete!\n\n");
// Check database connection // Check database connection
$this->output("Checking database...\n"); $this->out("Checking database...\n");
$checkResults['db'] = array(); $checkResults['db'] = array();
$checkResults['db'][] = $this->runDatabaseCheck($db_host, $db_user, $db_pass, $db_data); $checkResults['db'][] = $this->runDatabaseCheck($db_host, $db_user, $db_pass, $db_data);
$errorMessage = $this->extractErrors($checkResults['db']); $errorMessage = $this->extractErrors($checkResults['db']);
if ($errorMessage !== '') { if ($errorMessage !== '') {
die($errorMessage); throw new \RuntimeException($errorMessage);
} }
$this->output(" Complete!\n\n"); $this->out(" Complete!\n\n");
// Install database // Install database
$this->output("Inserting data into database...\n"); $this->out("Inserting data into database...\n");
$checkResults['data'] = load_database(); $checkResults['data'] = load_database();
if ($checkResults['data'] !== '') { if ($checkResults['data'] !== '') {
die("ERROR: DB Database creation error. Is the DB empty?\n"); throw new \RuntimeException("ERROR: DB Database creation error. Is the DB empty?\n");
} }
$this->output(" Complete!\n\n"); $this->out(" Complete!\n\n");
// Copy config file // Copy config file
$this->output("Saving config file...\n"); $this->out("Saving config file...\n");
if (!copy('.htautoinstall.php', '.htconfig.php')) { if (!copy('htconfig.php', '.htconfig.php')) {
die("ERROR: Saving config file failed. Please copy .htautoinstall.php to .htconfig.php manually.\n"); throw new \RuntimeException("ERROR: Saving config file failed. Please copy .htautoinstall.php to .htconfig.php manually.\n");
} }
$this->output(" Complete!\n\n"); $this->out(" Complete!\n\n");
$this->output("\nInstallation is finished\n"); $this->out("\nInstallation is finished\n");
return 0; return 0;
} }
@ -103,7 +94,7 @@ HELP;
* @param App $app * @param App $app
* @return array * @return array
*/ */
public function runBasicChecks($app) private function runBasicChecks($app)
{ {
$checks = []; $checks = [];
@ -116,10 +107,10 @@ HELP;
if (!empty($app->config['php_path'])) { if (!empty($app->config['php_path'])) {
check_php($app->config['php_path'], $checks); check_php($app->config['php_path'], $checks);
} else { } else {
die(" ERROR: The php_path is not set in the config. Please check the file .htconfig.php.\n"); throw new \RuntimeException(" ERROR: The php_path is not set in the config. Please check the file .htconfig.php.\n");
} }
$this->output(" NOTICE: Not checking .htaccess/URL-Rewrite during CLI installation.\n"); $this->out(" NOTICE: Not checking .htaccess/URL-Rewrite during CLI installation.\n");
return $checks; return $checks;
} }
@ -131,7 +122,7 @@ HELP;
* @param $db_data * @param $db_data
* @return array * @return array
*/ */
public function runDatabaseCheck($db_host, $db_user, $db_pass, $db_data) private function runDatabaseCheck($db_host, $db_user, $db_pass, $db_data)
{ {
$result = array( $result = array(
'title' => 'MySQL Connection', 'title' => 'MySQL Connection',
@ -153,7 +144,7 @@ HELP;
* @param array $results * @param array $results
* @return string * @return string
*/ */
public function extractErrors($results) private function extractErrors($results)
{ {
$errorMessage = ''; $errorMessage = '';
$allChecksRequired = $this->getOption('a') !== null; $allChecksRequired = $this->getOption('a') !== null;
@ -167,15 +158,4 @@ HELP;
return $errorMessage; return $errorMessage;
} }
/**
* @param string $text
*/
public function output($text)
{
$debugInfo = $this->getOption('v') !== null;
if ($debugInfo) {
echo $text;
}
}
} }