Browse Source

Remove php_path duplicate in auto-install

tags/2019.06^2
Philipp Holzer 1 year ago
parent
commit
d90eb6a811
No known key found for this signature in database GPG Key ID: 517BE60E2CE5C8A5
1 changed files with 1 additions and 4 deletions
  1. +1
    -4
      src/Core/Console/AutomaticInstallation.php

+ 1
- 4
src/Core/Console/AutomaticInstallation.php View File

@@ -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);



Loading…
Cancel
Save