Don't play with config values ...
This commit is contained in:
parent
cba3ec2c7f
commit
96b223676d
|
@ -40,9 +40,8 @@ class Install extends Command {
|
||||||
protected function execute(InputInterface $input, OutputInterface $output) {
|
protected function execute(InputInterface $input, OutputInterface $output) {
|
||||||
|
|
||||||
// validate the environment
|
// validate the environment
|
||||||
$this->config->setSystemValue('supportedDatabases', ['sqlite', 'mysql', 'pgsql', 'oci']);
|
|
||||||
$setupHelper = new Setup($this->config, \OC::$server->getIniWrapper(), \OC::$server->getL10N('lib'), new \OC_Defaults());
|
$setupHelper = new Setup($this->config, \OC::$server->getIniWrapper(), \OC::$server->getL10N('lib'), new \OC_Defaults());
|
||||||
$sysInfo = $setupHelper->getSystemInfo();
|
$sysInfo = $setupHelper->getSystemInfo(true);
|
||||||
$errors = $sysInfo['errors'];
|
$errors = $sysInfo['errors'];
|
||||||
if (count($errors) > 0) {
|
if (count($errors) > 0) {
|
||||||
$this->printErrors($output, $errors);
|
$this->printErrors($output, $errors);
|
||||||
|
|
|
@ -68,10 +68,11 @@ class Setup {
|
||||||
/**
|
/**
|
||||||
* Get the available and supported databases of this instance
|
* Get the available and supported databases of this instance
|
||||||
*
|
*
|
||||||
* @throws Exception
|
* @param bool $allowAllDatabases
|
||||||
* @return array
|
* @return array
|
||||||
|
* @throws Exception
|
||||||
*/
|
*/
|
||||||
public function getSupportedDatabases() {
|
public function getSupportedDatabases($allowAllDatabases = false) {
|
||||||
$availableDatabases = array(
|
$availableDatabases = array(
|
||||||
'sqlite' => array(
|
'sqlite' => array(
|
||||||
'type' => 'class',
|
'type' => 'class',
|
||||||
|
@ -99,8 +100,12 @@ class Setup {
|
||||||
'name' => 'MS SQL'
|
'name' => 'MS SQL'
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
if ($allowAllDatabases) {
|
||||||
|
$configuredDatabases = array_keys($availableDatabases);
|
||||||
|
} else {
|
||||||
$configuredDatabases = $this->config->getSystemValue('supportedDatabases',
|
$configuredDatabases = $this->config->getSystemValue('supportedDatabases',
|
||||||
array('sqlite', 'mysql', 'pgsql'));
|
array('sqlite', 'mysql', 'pgsql'));
|
||||||
|
}
|
||||||
if(!is_array($configuredDatabases)) {
|
if(!is_array($configuredDatabases)) {
|
||||||
throw new Exception('Supported databases are not properly configured.');
|
throw new Exception('Supported databases are not properly configured.');
|
||||||
}
|
}
|
||||||
|
@ -131,8 +136,8 @@ class Setup {
|
||||||
* @return array of system info, including an "errors" value
|
* @return array of system info, including an "errors" value
|
||||||
* in case of errors/warnings
|
* in case of errors/warnings
|
||||||
*/
|
*/
|
||||||
public function getSystemInfo() {
|
public function getSystemInfo($allowAllDatabases = false) {
|
||||||
$databases = $this->getSupportedDatabases();
|
$databases = $this->getSupportedDatabases($allowAllDatabases);
|
||||||
|
|
||||||
$dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data');
|
$dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data');
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue