diff options
| author | Tilo Spannagel <development@tilosp.de> | 2017-06-29 16:33:58 +0300 |
|---|---|---|
| committer | Tilo Spannagel <development@tilosp.de> | 2017-06-29 17:00:46 +0300 |
| commit | 4d0972ed3533d3c6bce085855897a353b9f61400 (patch) | |
| tree | 1a633a582edfe7128c1271f23cc5a732f5a1e781 /docker-entrypoint.sh | |
| parent | 0061b638cc6ae02faf799aaf45bfff5d696d7f89 (diff) | |
Ensure apps.config.php get only copied when upgrading from old version
Diffstat (limited to 'docker-entrypoint.sh')
| -rwxr-xr-x | docker-entrypoint.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 31d3e6c..f073581 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -29,16 +29,20 @@ if version_greater "$image_version" "$installed_version"; then fi rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/ - for dir in config data custom_apps themes; do + for dir in config data themes; do if [ ! -d /var/www/html/"$dir" ] || directory_empty /var/www/html/"$dir"; then cp -arT /usr/src/nextcloud/"$dir" /var/www/html/"$dir" fi done - if [ ! -f /var/www/html/config/apps.config.php ]; then + if [ ! -d /var/www/html/custom_apps ] && [ ! -f /var/www/html/config/apps.config.php ]; then cp -a /usr/src/nextcloud/config/apps.config.php /var/www/html/config/apps.config.php fi + if [ ! -d /var/www/html/custom_apps ] || directory_empty /var/www/html/custom_apps; then + cp -arT /usr/src/nextcloud/custom_apps /var/www/html/custom_apps + 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' |