diff options
| author | Bernhard Posselt <dev@bernhard-posselt.com> | 2015-04-29 12:15:40 +0200 |
|---|---|---|
| committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2015-04-29 15:39:51 +0200 |
| commit | b0d1d61db2b9a5eda23e4e496bcacad861ed5774 (patch) | |
| tree | 8b3a7adebfa89e2fe017776450cc6afa482f0a47 /core/command/maintenance/install.php | |
| parent | 8c7db2536dc1107bca6b427af25d713a97c0be96 (diff) | |
| download | nextcloud-server-b0d1d61db2b9a5eda23e4e496bcacad861ed5774.tar.gz nextcloud-server-b0d1d61db2b9a5eda23e4e496bcacad861ed5774.zip | |
default to an empty string for database password if ommited
fix null passwords
remove password trimming
Diffstat (limited to 'core/command/maintenance/install.php')
| -rw-r--r-- | core/command/maintenance/install.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/command/maintenance/install.php b/core/command/maintenance/install.php index d55bc0ba3bd..361e63154c8 100644 --- a/core/command/maintenance/install.php +++ b/core/command/maintenance/install.php @@ -49,7 +49,7 @@ class Install extends Command { ->addOption('database-name', null, InputOption::VALUE_REQUIRED, 'Name of the database') ->addOption('database-host', null, InputOption::VALUE_REQUIRED, 'Hostname of the database', 'localhost') ->addOption('database-user', null, InputOption::VALUE_REQUIRED, 'User name to connect to the database') - ->addOption('database-pass', null, InputOption::VALUE_REQUIRED, 'Password of the database user') + ->addOption('database-pass', null, InputOption::VALUE_REQUIRED, 'Password of the database user', null) ->addOption('database-table-prefix', null, InputOption::VALUE_OPTIONAL, 'Prefix for all tables (default: oc_)', null) ->addOption('admin-user', null, InputOption::VALUE_REQUIRED, 'User name of the admin account', 'admin') ->addOption('admin-pass', null, InputOption::VALUE_REQUIRED, 'Password of the admin account') @@ -102,6 +102,9 @@ class Install extends Command { $dbTablePrefix = (string) $input->getOption('database-table-prefix'); $dbTablePrefix = trim($dbTablePrefix); } + if ($input->hasParameterOption('--database-pass')) { + $dbPass = (string) $input->getOption('database-pass'); + } $adminLogin = $input->getOption('admin-user'); $adminPassword = $input->getOption('admin-pass'); $dataDir = $input->getOption('data-dir'); |