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

autoinstall: handle -f/--file as single config file 

as help string says.
This commit is contained in:
fabrixxm 2021-05-24 15:13:01 +02:00
parent 1e00bf430e
commit 613cdf7ee1
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
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
@ -139,15 +138,16 @@ HELP;
$config_file = $this->getOption(['f', 'file']); $config_file = $this->getOption(['f', 'file']);
if (!empty($config_file)) { if (!empty($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.\n");
} }
//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...\n");
@ -229,7 +229,7 @@ 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...\n");
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");
} }
} }