From ee61df9ca5a666ea9328254e2df44440076ab7b2 Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Mon, 26 Jun 2023 16:29:21 +0100
Subject: [PATCH] Fix order of operations

---
 .../s6-overlay/s6-rc.d/init-nextcloud-config/run   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/root/etc/s6-overlay/s6-rc.d/init-nextcloud-config/run b/root/etc/s6-overlay/s6-rc.d/init-nextcloud-config/run
index 3858593..49c4045 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-nextcloud-config/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-nextcloud-config/run
@@ -36,13 +36,6 @@ for dir in apps config themes; do
     fi
 done
 
-# set data directory
-if [ -f /config/www/nextcloud/config/config.php ]; then
-    sed -i "s|/app/www/public/data|/data|g" /config/www/nextcloud/config/config.php
-else
-    echo -e "<?php\n\$CONFIG = ['datadirectory' => '/data'];" >/config/www/nextcloud/config/config.php
-fi
-
 # get versions
 image_version=$(php -r "require '/app/www/src/version.php'; echo implode('.', \$OC_Version);" 2>/dev/null)
 installed_version=$(php -r "require '/config/www/nextcloud/config/config.php'; echo \$CONFIG['version'];" 2>/dev/null)
@@ -156,3 +149,10 @@ if (occ app:list --no-interaction | grep -q richdocumentscode) 2>/dev/null; then
     APP=$(occ app:list --no-interaction | grep richdocumentscode | awk -F ' ' '{print $2}' | tr -d ':')
     occ app:remove --no-interaction "${APP}" 2>/dev/null
 fi
+
+# set data directory
+if [ ! -s /config/www/nextcloud/config/config.php ]; then
+    echo -e "<?php\n\$CONFIG = array (\n    'datadirectory' => '/data',\n);" >/config/www/nextcloud/config/config.php
+elif [ -f /config/www/nextcloud/config/config.php ]; then
+    sed -i "s|/app/www/public/data|/data|g" /config/www/nextcloud/config/config.php
+fi