From 4a13a84cab8d775386fbc26534b009aa42ee79f9 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Thu, 19 Mar 2015 09:07:29 +0100
Subject: [PATCH] Do not add apps2/ directory if it does not exist
---
tests/preseed-config.php | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/tests/preseed-config.php b/tests/preseed-config.php
index 3f41573bf29..e2c5a55fa58 100644
--- a/tests/preseed-config.php
+++ b/tests/preseed-config.php
@@ -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'];
}
--
GitLab