clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10311 from fabrixxm/fix/consoleautoinstall 

console autoinstall: handle `-f/--file` as single config file
This commit is contained in:
Hypolite Petovan 2021-05-24 10:30:45 -04:00 committed by GitHub
parent cf6f9d6c60 c45a1d1e4d
commit 6ef9ccbb97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/Console/AutomaticInstallation.php
View File

@ -30,7 +30,6 @@ use Friendica\Core\Installer;
use Friendica\Core\Theme; use Friendica\Core\Theme;
use Friendica\Database\Database; use Friendica\Database\Database;
use Friendica\Util\BasePath; use Friendica\Util\BasePath;
use Friendica\Util\ConfigFileLoader;
use RuntimeException; use RuntimeException;
class AutomaticInstallation extends Console class AutomaticInstallation extends Console
@ -112,7 +111,7 @@ HELP;
protected function doExecute() protected function doExecute()
{ {
// Initialise the app // Initialise the app
$this->out("Initializing setup...\n"); $this->out("Initializing setup...");
$installer = new Installer(); $installer = new Installer();
@ -121,10 +120,10 @@ HELP;
$basepath = new BasePath($basePathConf); $basepath = new BasePath($basePathConf);
$installer->setUpCache($configCache, $basepath->getPath()); $installer->setUpCache($configCache, $basepath->getPath());
$this->out(" Complete!\n\n"); $this->out(" Complete!\n");
// Check Environment // Check Environment
$this->out("Checking environment...\n"); $this->out("Checking environment...");
$installer->resetChecks(); $installer->resetChecks();
@ -133,24 +132,26 @@ HELP;
throw new RuntimeException($errorMessage); throw new RuntimeException($errorMessage);
} }
$this->out(" Complete!\n\n"); $this->out(" Complete!\n");
// if a config file is set, // if a config file is set,
$config_file = $this->getOption(['f', 'file']); $config_file = $this->getOption(['f', 'file']);
if (!empty($config_file)) { if (!empty($config_file)) {
$this->out("Loading config file '$config_file'...");
if (!file_exists($config_file)) { if (!file_exists($config_file)) {
throw new RuntimeException("ERROR: Config file does not exist.\n"); throw new RuntimeException("ERROR: Config file does not exist.");
} }
//reload the config cache //append config file to the config cache
$loader = new ConfigFileLoader($config_file); $config = include($config_file);
$loader->setupCache($configCache); if (!is_array($config)) {
throw new Exception('Error loading config file ' . $config_file);
}
$configCache->load($config, Cache::SOURCE_FILE);
} else { } else {
// Creating config file // Creating config file
$this->out("Creating config file...\n"); $this->out("Creating config file...");
$save_db = $this->getOption(['s', 'savedb'], false); $save_db = $this->getOption(['s', 'savedb'], false);
@ -202,10 +203,10 @@ HELP;
$installer->createConfig($configCache); $installer->createConfig($configCache);
} }
$this->out("Complete!\n\n"); $this->out(" Complete!\n");
// Check database connection // Check database connection
$this->out("Checking database...\n"); $this->out("Checking database...");
$installer->resetChecks(); $installer->resetChecks();
@ -214,7 +215,7 @@ HELP;
throw new RuntimeException($errorMessage); throw new RuntimeException($errorMessage);
} }
$this->out(" Complete!\n\n"); $this->out(" Complete!\n");
// Install database // Install database
$this->out("Inserting data into database...\n"); $this->out("Inserting data into database...\n");
@ -228,24 +229,24 @@ HELP;
if (!empty($config_file) && $config_file != 'config' . DIRECTORY_SEPARATOR . 'local.config.php') { if (!empty($config_file) && $config_file != 'config' . DIRECTORY_SEPARATOR . 'local.config.php') {
// Copy config file // Copy config file
$this->out("Copying config file...\n"); $this->out("Copying config file...");
if (!copy($basePathConf . DIRECTORY_SEPARATOR . $config_file, $basePathConf . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'local.config.php')) { if (!copy($config_file, $basePathConf . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR . 'local.config.php')) {
throw new RuntimeException("ERROR: Saving config file failed. Please copy '$config_file' to '" . $basePathConf . "'" . DIRECTORY_SEPARATOR . "config" . DIRECTORY_SEPARATOR . "local.config.php' manually.\n"); throw new RuntimeException("ERROR: Saving config file failed. Please copy '$config_file' to '" . $basePathConf . "'" . DIRECTORY_SEPARATOR . "config" . DIRECTORY_SEPARATOR . "local.config.php' manually.\n");
} }
} }
$this->out(" Complete!\n\n"); $this->out(" Complete!\n");
// Install theme // Install theme
$this->out("Installing theme\n"); $this->out("Installing theme");
if (!empty($this->config->get('system', 'theme'))) { if (!empty($this->config->get('system', 'theme'))) {
Theme::install($this->config->get('system', 'theme')); Theme::install($this->config->get('system', 'theme'));
$this->out(" Complete\n\n"); $this->out(" Complete\n");
} else { } else {
$this->out(" Theme setting is empty. Please check the file 'config/local.config.php'\n\n"); $this->out(" Theme setting is empty. Please check the file 'config/local.config.php'\n");
} }
$this->out("\nInstallation is finished\n"); $this->out("\nInstallation is finished");
return 0; return 0;
} }