From fa78f148c8b33486696cf0f7733e958004a0152e Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Tue, 1 May 2018 13:11:25 +0200 Subject: [PATCH] AutomaticInstallation - use config file - added new parameter "-f config file" to `AutomaticInstallation.php` --- src/Core/Console/AutomaticInstallation.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Core/Console/AutomaticInstallation.php b/src/Core/Console/AutomaticInstallation.php index e888d5a490..5ce1a96f8d 100644 --- a/src/Core/Console/AutomaticInstallation.php +++ b/src/Core/Console/AutomaticInstallation.php @@ -29,6 +29,7 @@ Options -h|--help|-? Show help information -v Show more debug information. -a All setup checks are required (except .htaccess) + -f "htconfig.php" file HELP; } @@ -42,7 +43,11 @@ HELP; $db_user = ''; $db_pass = ''; $db_data = ''; - require_once 'htconfig.php'; + + $config_file = $this->getOption('f', 'htconfig.php'); + + $this->out("Using config $config_file...\n"); + require_once $config_file; Install::setInstallMode(); @@ -87,8 +92,8 @@ HELP; // Copy config file $this->out("Saving config file...\n"); - if (!copy('htconfig.php', '.htconfig.php')) { - throw new \RuntimeException("ERROR: Saving config file failed. Please copy .htautoinstall.php to .htconfig.php manually.\n"); + if ($config_file != '.htconfig.php' && !copy($config_file, '.htconfig.php')) { + throw new \RuntimeException("ERROR: Saving config file failed. Please copy htconfig.php to .htconfig.php manually.\n"); } $this->out(" Complete!\n\n"); $this->out("\nInstallation is finished\n");