Do not add apps2/ directory if it does not exist

This commit is contained in:
Joas Schilling 2015-03-19 09:07:29 +01:00
parent 0bed187613
commit 4a13a84cab

View file

@ -1,23 +1,23 @@
<?php
$CONFIG = array (
"appstoreenabled" => false,
'apps_paths' =>
array (
0 =>
array (
'path' => OC::$SERVERROOT.'/apps',
'url' => '/apps',
'writable' => true,
),
1 =>
array (
'path' => OC::$SERVERROOT.'/apps2',
'url' => '/apps2',
'writable' => false,
)
),
);
$CONFIG = [
'appstoreenabled' => false,
'apps_paths' => [
[
'path' => OC::$SERVERROOT . '/apps',
'url' => '/apps',
'writable' => true,
],
],
];
if(substr(strtolower(PHP_OS), 0, 3) == "win") {
$CONFIG['openssl'] = array( 'config' => OC::$SERVERROOT.'/tests/data/openssl.cnf');
if (is_dir(OC::$SERVERROOT.'/apps2')) {
$CONFIG['apps_paths'][] = [
'path' => OC::$SERVERROOT . '/apps2',
'url' => '/apps2',
'writable' => false,
];
}
if (substr(strtolower(PHP_OS), 0, 3) === 'win') {
$CONFIG['openssl'] = ['config' => OC::$SERVERROOT . '/tests/data/openssl.cnf'];
}