From 749f25b93dc4644898b10f2f9524330051c42fe5 Mon Sep 17 00:00:00 2001
From: Tilo Spannagel <development@tilosp.de>
Date: Tue, 23 May 2017 21:12:06 +0200
Subject: [PATCH] Don't overwrite themes

---
 10.0/apache/docker-entrypoint.sh | 6 +++++-
 10.0/fpm/docker-entrypoint.sh    | 6 +++++-
 11.0/apache/docker-entrypoint.sh | 6 +++++-
 11.0/fpm/docker-entrypoint.sh    | 6 +++++-
 9.0/apache/docker-entrypoint.sh  | 6 +++++-
 9.0/fpm/docker-entrypoint.sh     | 6 +++++-
 docker-entrypoint.sh             | 6 +++++-
 7 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/10.0/apache/docker-entrypoint.sh b/10.0/apache/docker-entrypoint.sh
index b2bf65e7..b1265d39 100755
--- a/10.0/apache/docker-entrypoint.sh
+++ b/10.0/apache/docker-entrypoint.sh
@@ -22,7 +22,7 @@ if version_greater "$image_version" "$installed_version"; then
         su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
     fi
 
-    rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ /usr/src/nextcloud/ /var/www/html/
+    rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/
 
     if [ ! -d /var/www/html/config ]; then
         cp -arT /usr/src/nextcloud/config /var/www/html/config
@@ -37,6 +37,10 @@ if version_greater "$image_version" "$installed_version"; then
         cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php
     fi
 
+    if [ ! -d /var/www/html/themes ]; then
+        cp -arT /usr/src/nextcloud/themes /var/www/html/themes
+    fi
+
     if [ "$installed_version" != "0.0.0~unknown" ]; then
         su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable'
 
diff --git a/10.0/fpm/docker-entrypoint.sh b/10.0/fpm/docker-entrypoint.sh
index b2bf65e7..b1265d39 100755
--- a/10.0/fpm/docker-entrypoint.sh
+++ b/10.0/fpm/docker-entrypoint.sh
@@ -22,7 +22,7 @@ if version_greater "$image_version" "$installed_version"; then
         su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
     fi
 
-    rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ /usr/src/nextcloud/ /var/www/html/
+    rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/
 
     if [ ! -d /var/www/html/config ]; then
         cp -arT /usr/src/nextcloud/config /var/www/html/config
@@ -37,6 +37,10 @@ if version_greater "$image_version" "$installed_version"; then
         cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php
     fi
 
+    if [ ! -d /var/www/html/themes ]; then
+        cp -arT /usr/src/nextcloud/themes /var/www/html/themes
+    fi
+
     if [ "$installed_version" != "0.0.0~unknown" ]; then
         su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable'
 
diff --git a/11.0/apache/docker-entrypoint.sh b/11.0/apache/docker-entrypoint.sh
index b2bf65e7..b1265d39 100755
--- a/11.0/apache/docker-entrypoint.sh
+++ b/11.0/apache/docker-entrypoint.sh
@@ -22,7 +22,7 @@ if version_greater "$image_version" "$installed_version"; then
         su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
     fi
 
-    rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ /usr/src/nextcloud/ /var/www/html/
+    rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/
 
     if [ ! -d /var/www/html/config ]; then
         cp -arT /usr/src/nextcloud/config /var/www/html/config
@@ -37,6 +37,10 @@ if version_greater "$image_version" "$installed_version"; then
         cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php
     fi
 
+    if [ ! -d /var/www/html/themes ]; then
+        cp -arT /usr/src/nextcloud/themes /var/www/html/themes
+    fi
+
     if [ "$installed_version" != "0.0.0~unknown" ]; then
         su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable'
 
diff --git a/11.0/fpm/docker-entrypoint.sh b/11.0/fpm/docker-entrypoint.sh
index b2bf65e7..b1265d39 100755
--- a/11.0/fpm/docker-entrypoint.sh
+++ b/11.0/fpm/docker-entrypoint.sh
@@ -22,7 +22,7 @@ if version_greater "$image_version" "$installed_version"; then
         su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
     fi
 
-    rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ /usr/src/nextcloud/ /var/www/html/
+    rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/
 
     if [ ! -d /var/www/html/config ]; then
         cp -arT /usr/src/nextcloud/config /var/www/html/config
@@ -37,6 +37,10 @@ if version_greater "$image_version" "$installed_version"; then
         cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php
     fi
 
+    if [ ! -d /var/www/html/themes ]; then
+        cp -arT /usr/src/nextcloud/themes /var/www/html/themes
+    fi
+
     if [ "$installed_version" != "0.0.0~unknown" ]; then
         su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable'
 
diff --git a/9.0/apache/docker-entrypoint.sh b/9.0/apache/docker-entrypoint.sh
index b2bf65e7..b1265d39 100755
--- a/9.0/apache/docker-entrypoint.sh
+++ b/9.0/apache/docker-entrypoint.sh
@@ -22,7 +22,7 @@ if version_greater "$image_version" "$installed_version"; then
         su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
     fi
 
-    rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ /usr/src/nextcloud/ /var/www/html/
+    rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/
 
     if [ ! -d /var/www/html/config ]; then
         cp -arT /usr/src/nextcloud/config /var/www/html/config
@@ -37,6 +37,10 @@ if version_greater "$image_version" "$installed_version"; then
         cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php
     fi
 
+    if [ ! -d /var/www/html/themes ]; then
+        cp -arT /usr/src/nextcloud/themes /var/www/html/themes
+    fi
+
     if [ "$installed_version" != "0.0.0~unknown" ]; then
         su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable'
 
diff --git a/9.0/fpm/docker-entrypoint.sh b/9.0/fpm/docker-entrypoint.sh
index b2bf65e7..b1265d39 100755
--- a/9.0/fpm/docker-entrypoint.sh
+++ b/9.0/fpm/docker-entrypoint.sh
@@ -22,7 +22,7 @@ if version_greater "$image_version" "$installed_version"; then
         su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
     fi
 
-    rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ /usr/src/nextcloud/ /var/www/html/
+    rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/
 
     if [ ! -d /var/www/html/config ]; then
         cp -arT /usr/src/nextcloud/config /var/www/html/config
@@ -37,6 +37,10 @@ if version_greater "$image_version" "$installed_version"; then
         cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php
     fi
 
+    if [ ! -d /var/www/html/themes ]; then
+        cp -arT /usr/src/nextcloud/themes /var/www/html/themes
+    fi
+
     if [ "$installed_version" != "0.0.0~unknown" ]; then
         su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable'
 
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index b2bf65e7..b1265d39 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -22,7 +22,7 @@ if version_greater "$image_version" "$installed_version"; then
         su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
     fi
 
-    rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ /usr/src/nextcloud/ /var/www/html/
+    rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/
 
     if [ ! -d /var/www/html/config ]; then
         cp -arT /usr/src/nextcloud/config /var/www/html/config
@@ -37,6 +37,10 @@ if version_greater "$image_version" "$installed_version"; then
         cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php
     fi
 
+    if [ ! -d /var/www/html/themes ]; then
+        cp -arT /usr/src/nextcloud/themes /var/www/html/themes
+    fi
+
     if [ "$installed_version" != "0.0.0~unknown" ]; then
         su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable'