Improved protocol storing

[friendica.git] / src / Core / Console / AutomaticInstallation.php

diff --git a/src/Core/Console/AutomaticInstallation.php b/src/Core/Console/AutomaticInstallation.php
index 2aacc11094bfb581b5f0dec5570afdb58ab480a9..e2857d65173328e7a138723dd6427eb87b7fbc33 100644 (file)
--- a/src/Core/Console/AutomaticInstallation.php
+++ b/src/Core/Console/AutomaticInstallation.php
@@ -40,7 +40,7 @@ Options
     -P|--dbpass <password>    The password of the mysql/mariadb database login (env MYSQL_PASSWORD)
     -U|--url <url>            The full base URL of Friendica - f.e. 'https://friendica.local/sub' (env FRIENDICA_URL) 
     -B|--phppath <php_path>   The path of the PHP binary (env FRIENDICA_PHP_PATH)
-    -b|--basepath <base_path> The basepath of Friendica(env FRIENDICA_BASE_PATH)
+    -b|--basepath <base_path> The basepath of Friendica (env FRIENDICA_BASE_PATH)
     -t|--tz <timezone>        The timezone of Friendica (env FRIENDICA_TZ)
     -L|--lang <language>      The language of Friendica (env FRIENDICA_LANG)
  
@@ -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);