From d90eb6a811cfb57dfbe1de295f494de3bfee0e09 Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Sat, 13 Apr 2019 22:51:45 +0200 Subject: [PATCH] Remove php_path duplicate in auto-install --- src/Core/Console/AutomaticInstallation.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/Core/Console/AutomaticInstallation.php b/src/Core/Console/AutomaticInstallation.php index 2aacc11094..561b05a1d2 100644 --- a/src/Core/Console/AutomaticInstallation.php +++ b/src/Core/Console/AutomaticInstallation.php @@ -129,6 +129,7 @@ HELP; $configCache->set('database', 'password', $this->getOption(['P', 'dbpass'], ($save_db) ? getenv('MYSQL_PASSWORD') : '')); + $php_path = $this->getOption(['b', 'phppath'], !empty('FRIENDICA_PHP_PATH') ? getenv('FRIENDICA_PHP_PATH') : null); if (!empty($php_path)) { $configCache->set('config', 'php_path', $php_path); @@ -150,10 +151,6 @@ HELP; if (!empty($basepath)) { $configCache->set('system', 'basepath', $basepath); } - $php_path = $this->getOption(['B', 'phppath'], !empty(getenv('FRIENDICA_PHP_PATH')) ? getenv('FRIENDICA_PHP_PATH') : null); - if (!empty($php_path)) { - $configCache->set('config', 'php_path', $php_path); - } $url = $this->getOption(['U', 'url'], !empty(getenv('FRIENDICA_URL')) ? getenv('FRIENDICA_URL') : null); -- 2.39.5