Merge pull request #79 from tilosp-docker/exclude-themes

Don't overwrite themes
This commit is contained in:
Tilo Spannagel 2017-06-03 14:13:22 +02:00 committed by GitHub
commit 31c6487e4f
7 changed files with 35 additions and 7 deletions

View File

@ -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 su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
fi 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 if [ ! -d /var/www/html/config ]; then
cp -arT /usr/src/nextcloud/config /var/www/html/config 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 cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php
fi 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 if [ "$installed_version" != "0.0.0~unknown" ]; then
su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable' su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable'

View File

@ -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 su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
fi 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 if [ ! -d /var/www/html/config ]; then
cp -arT /usr/src/nextcloud/config /var/www/html/config 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 cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php
fi 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 if [ "$installed_version" != "0.0.0~unknown" ]; then
su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable' su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable'

View File

@ -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 su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
fi 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 if [ ! -d /var/www/html/config ]; then
cp -arT /usr/src/nextcloud/config /var/www/html/config 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 cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php
fi 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 if [ "$installed_version" != "0.0.0~unknown" ]; then
su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable' su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable'

View File

@ -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 su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
fi 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 if [ ! -d /var/www/html/config ]; then
cp -arT /usr/src/nextcloud/config /var/www/html/config 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 cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php
fi 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 if [ "$installed_version" != "0.0.0~unknown" ]; then
su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable' su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable'

View File

@ -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 su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
fi 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 if [ ! -d /var/www/html/config ]; then
cp -arT /usr/src/nextcloud/config /var/www/html/config 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 cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php
fi 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 if [ "$installed_version" != "0.0.0~unknown" ]; then
su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable' su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable'

View File

@ -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 su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
fi 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 if [ ! -d /var/www/html/config ]; then
cp -arT /usr/src/nextcloud/config /var/www/html/config 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 cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php
fi 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 if [ "$installed_version" != "0.0.0~unknown" ]; then
su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable' su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable'

View File

@ -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 su - www-data -s /bin/bash -c 'php /var/www/html/occ app:list' > /tmp/list_before
fi 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 if [ ! -d /var/www/html/config ]; then
cp -arT /usr/src/nextcloud/config /var/www/html/config 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 cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php
fi 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 if [ "$installed_version" != "0.0.0~unknown" ]; then
su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable' su - www-data -s /bin/bash -c 'php /var/www/html/occ upgrade --no-app-disable'