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 ed890f3c05f635813394d8e832f05f6f83713f55..e2857d65173328e7a138723dd6427eb87b7fbc33 100644 (file)
--- a/src/Core/Console/AutomaticInstallation.php
+++ b/src/Core/Console/AutomaticInstallation.php
@@ -32,17 +32,17 @@ Options
     -v                      Show more debug information.
     -a                      All setup checks are required (except .htaccess)
     -f|--file <config>      prepared config file (e.g. "config/local.config.php" itself) which will override every other config option - except the environment variables)
-    -s|--savedb                 Save the DB credentials to the file (if environment variables is used)
-    -H|--dbhost <host>          The host of the mysql/mariadb database (env MYSQL_HOST)
-    -p|--dbport <port>          The port of the mysql/mariadb database (env MYSQL_PORT)
-    -d|--dbdata <database>      The name of the mysql/mariadb database (env MYSQL_DATABASE)
-    -U|--dbuser <username>      The username of the mysql/mariadb database login (env MYSQL_USER or MYSQL_USERNAME)
-    -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)
-    -t|--tz <timezone>          The timezone of Friendica (env FRIENDICA_TZ)
-    -L|--lang <language>        The language of Friendica (env FRIENDICA_LANG)
+    -s|--savedb               Save the DB credentials to the file (if environment variables is used)
+    -H|--dbhost <host>        The host of the mysql/mariadb database (env MYSQL_HOST)
+    -p|--dbport <port>        The port of the mysql/mariadb database (env MYSQL_PORT)
+    -d|--dbdata <database>    The name of the mysql/mariadb database (env MYSQL_DATABASE)
+    -U|--dbuser <username>    The username of the mysql/mariadb database login (env MYSQL_USER or MYSQL_USERNAME)
+    -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)
+    -t|--tz <timezone>        The timezone of Friendica (env FRIENDICA_TZ)
+    -L|--lang <language>      The language of Friendica (env FRIENDICA_LANG)
  
 Environment variables
    MYSQL_HOST                  The host of the mysql/mariadb database (mandatory if mysql and environment is used)
@@ -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);