From 277503209ac46d20b8c6acf5f6d1e2dd79df9afe Mon Sep 17 00:00:00 2001
From: Christian Kampka <christian@kampka.net>
Date: Sat, 28 Feb 2015 21:41:33 +0100
Subject: [PATCH] Install command should not require table prefix
---
core/command/maintenance/install.php | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/core/command/maintenance/install.php b/core/command/maintenance/install.php
index 0b01afc20e..71cbc3d491 100644
--- a/core/command/maintenance/install.php
+++ b/core/command/maintenance/install.php
@@ -30,7 +30,7 @@ class Install extends Command {
->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-table-prefix', null, InputOption::VALUE_REQUIRED, 'Prefix for all tables', 'oc_')
+ ->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')
->addOption('data-dir', null, InputOption::VALUE_REQUIRED, 'Path to data directory', \OC::$SERVERROOT."/data");
@@ -80,7 +80,11 @@ class Install extends Command {
$dbPass = $input->getOption('database-pass');
$dbName = $input->getOption('database-name');
$dbHost = $input->getOption('database-host');
- $dbTablePrefix = $input->getOption('database-table-prefix');
+ $dbTablePrefix = 'oc_';
+ if ($input->hasParameterOption('--database-table-prefix')) {
+ $dbTablePrefix = (string) $input->getOption('database-table-prefix');
+ $dbTablePrefix = trim($dbTablePrefix);
+ }
$adminLogin = $input->getOption('admin-user');
$adminPassword = $input->getOption('admin-pass');
$dataDir = $input->getOption('data-dir');
--
GitLab