From 3fce60700c4956f62853eeb227172cca1ba12eb5 Mon Sep 17 00:00:00 2001
From: Martin <martin.mattel@diemattels.at>
Date: Wed, 28 Mar 2018 17:09:29 +0200
Subject: [PATCH] Add per default the apps2 directory in config.php during
 installation

---
 Makefile              | 10 +++++-----
 apps2/.gitkeep        |  0
 lib/private/Setup.php | 32 ++++++++++++++++++++++++++++++--
 3 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100644 apps2/.gitkeep

diff --git a/Makefile b/Makefile
index 73463bfd22fe..6dd69aa31ed0 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@ core_vendor=core/vendor
 
 core_doc_files=AUTHORS COPYING README.md
 core_src_files=$(wildcard *.php) index.html db_structure.xml .htaccess .user.ini
-core_src_dirs=apps core l10n lib occ ocs ocs-provider resources settings
+core_src_dirs=apps apps2 core l10n lib occ ocs ocs-provider resources settings
 core_test_dirs=tests
 core_all_src=$(core_src_files) $(core_src_dirs) $(core_doc_files)
 dist_dir=build/dist
@@ -230,7 +230,7 @@ $(dist_dir)/owncloud: $(composer_deps) $(nodejs_deps) $(core_all_src)
 	rm -Rf $@/settings/tests
 	rm -Rf $@/core/vendor/*/{.bower.json,bower.json,package.json,testem.json}
 	find $@/{core/,l10n/} -iname \*.sh -delete
-	find $@/{apps/,lib/composer/,core/vendor/} \( \
+	find $@/{apps/,apps2/,lib/composer/,core/vendor/} \( \
 		-name bin -o \
 		-name test -o \
 		-name tests -o \
@@ -241,7 +241,7 @@ $(dist_dir)/owncloud: $(composer_deps) $(nodejs_deps) $(core_all_src)
 		-name travis -o \
 		-iname \*.sh \
 		\) -print | xargs rm -Rf
-	find $@/{apps/,lib/composer/} -iname \*.exe -delete
+	find $@/{apps/,apps2/,lib/composer/} -iname \*.exe -delete
 	# Set build
 	$(eval _BUILD="$(shell date -u --iso-8601=seconds) $(shell git rev-parse HEAD)")
 	# Replace channel in version.php
@@ -280,7 +280,7 @@ $(dist_dir)/qa/owncloud: $(composer_dev_deps) $(nodejs_deps) $(core_all_src) $(c
 	find $@ -name no-php -delete
 	rm -Rf $@/core/vendor/*/{.bower.json,bower.json,package.json,testem.json}
 	find $@/{core/,l10n/} -iname \*.sh -delete
-	find $@/{apps/,lib/composer/,core/vendor/} \( \
+	find $@/{apps/,apps2/,lib/composer/,core/vendor/} \( \
 		-name test -o \
 		-name examples -o \
 		-name demo -o \
@@ -289,7 +289,7 @@ $(dist_dir)/qa/owncloud: $(composer_dev_deps) $(nodejs_deps) $(core_all_src) $(c
 		-name travis -o \
 		-iname \*.sh \
 		\) -print | xargs rm -Rf
-	find $@/{apps/,lib/composer/} -iname \*.exe -delete
+	find $@/{apps/,apps2/,lib/composer/} -iname \*.exe -delete
 	# Set build
 	$(eval _BUILD="$(shell date -u --iso-8601=seconds) $(shell git rev-parse HEAD)")
 	# Replace channel in version.php
diff --git a/apps2/.gitkeep b/apps2/.gitkeep
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/lib/private/Setup.php b/lib/private/Setup.php
index 76bbe6b1a886..075abb1e443e 100644
--- a/lib/private/Setup.php
+++ b/lib/private/Setup.php
@@ -373,15 +373,43 @@ public function install($options) {
 			Setup::updateHtaccess();
 			Setup::protectDataDirectory();
 
-			//try to write logtimezone
+			// try to write logtimezone
 			if (date_default_timezone_get()) {
 				$config->setSystemValue('logtimezone', date_default_timezone_get());
 			}
 
 			self::installBackgroundJobs();
 
-			//and we are done
 			$config->setSystemValue('installed', true);
+
+			// adding the apps2 directory by default using apps_path
+			$apps2Key = \OC::$server->getSystemConfig()->getValue('apps_paths', false);
+			
+			// add the key only if it does not exist (protect for possible overwriting)
+			if ($apps2Key === false) {
+				$appsDir = \OC::$SERVERROOT . '/apps';
+				$apps2Dir = \OC::$SERVERROOT . '/apps2';
+
+				$defaultAppsPaths = array(
+					'apps_path' => array(
+						0 => array(
+							"path" => $appsDir,
+							"url" => "/apps",
+							"writable" => "false"
+							),
+					    1 => array(
+							"path" => $apps2Dir,
+							"url" => "/apps2",
+							"writable" => "true"
+							)
+					)
+				);
+					    
+				$config->setSystemValues($defaultAppsPaths);
+			}
+
+			// finished initial setup
+			
 		}
 
 		return $error;