From 328b7f334fdfec69f4985e609386613470af87fa Mon Sep 17 00:00:00 2001 From: Tilo Spannagel Date: Wed, 1 Aug 2018 23:22:31 +0200 Subject: [PATCH] Run update.sh --- 12.0/apache/entrypoint.sh | 16 ++++++++-------- 12.0/fpm-alpine/entrypoint.sh | 16 ++++++++-------- 12.0/fpm/entrypoint.sh | 16 ++++++++-------- 13.0/apache/entrypoint.sh | 16 ++++++++-------- 13.0/fpm-alpine/entrypoint.sh | 16 ++++++++-------- 13.0/fpm/entrypoint.sh | 16 ++++++++-------- 14.0-beta/apache/entrypoint.sh | 16 ++++++++-------- 14.0-beta/fpm-alpine/entrypoint.sh | 16 ++++++++-------- 14.0-beta/fpm/entrypoint.sh | 16 ++++++++-------- 9 files changed, 72 insertions(+), 72 deletions(-) diff --git a/12.0/apache/entrypoint.sh b/12.0/apache/entrypoint.sh index 8f3ac087..2ad63ec4 100755 --- a/12.0/apache/entrypoint.sh +++ b/12.0/apache/entrypoint.sh @@ -3,7 +3,7 @@ set -eu # version_greater A B returns whether A > B version_greater() { - [ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 -k3,3 -k4,4 | head -n 1)" != "$1" ] + [ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 -k3,3 -k4,4 | head -n 1)" != "$1" ] } # return true if specified directory is empty @@ -12,11 +12,11 @@ directory_empty() { } run_as() { - if [ "$(id -u)" = 0 ]; then - su - www-data -s /bin/sh -c "$1" - else - sh -c "$1" - fi + if [ "$(id -u)" = 0 ]; then + su - www-data -s /bin/sh -c "$1" + else + sh -c "$1" + fi } installed_version="0.0.0.0" @@ -37,9 +37,9 @@ if version_greater "$image_version" "$installed_version"; then run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before fi if [ "$(id -u)" = 0 ]; then - rsync_options="-rlDog --chown www-data:root" + rsync_options="-rlDog --chown www-data:root" else - rsync_options="-rlD" + rsync_options="-rlD" fi rsync $rsync_options --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/ diff --git a/12.0/fpm-alpine/entrypoint.sh b/12.0/fpm-alpine/entrypoint.sh index 8f3ac087..2ad63ec4 100755 --- a/12.0/fpm-alpine/entrypoint.sh +++ b/12.0/fpm-alpine/entrypoint.sh @@ -3,7 +3,7 @@ set -eu # version_greater A B returns whether A > B version_greater() { - [ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 -k3,3 -k4,4 | head -n 1)" != "$1" ] + [ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 -k3,3 -k4,4 | head -n 1)" != "$1" ] } # return true if specified directory is empty @@ -12,11 +12,11 @@ directory_empty() { } run_as() { - if [ "$(id -u)" = 0 ]; then - su - www-data -s /bin/sh -c "$1" - else - sh -c "$1" - fi + if [ "$(id -u)" = 0 ]; then + su - www-data -s /bin/sh -c "$1" + else + sh -c "$1" + fi } installed_version="0.0.0.0" @@ -37,9 +37,9 @@ if version_greater "$image_version" "$installed_version"; then run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before fi if [ "$(id -u)" = 0 ]; then - rsync_options="-rlDog --chown www-data:root" + rsync_options="-rlDog --chown www-data:root" else - rsync_options="-rlD" + rsync_options="-rlD" fi rsync $rsync_options --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/ diff --git a/12.0/fpm/entrypoint.sh b/12.0/fpm/entrypoint.sh index 8f3ac087..2ad63ec4 100755 --- a/12.0/fpm/entrypoint.sh +++ b/12.0/fpm/entrypoint.sh @@ -3,7 +3,7 @@ set -eu # version_greater A B returns whether A > B version_greater() { - [ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 -k3,3 -k4,4 | head -n 1)" != "$1" ] + [ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 -k3,3 -k4,4 | head -n 1)" != "$1" ] } # return true if specified directory is empty @@ -12,11 +12,11 @@ directory_empty() { } run_as() { - if [ "$(id -u)" = 0 ]; then - su - www-data -s /bin/sh -c "$1" - else - sh -c "$1" - fi + if [ "$(id -u)" = 0 ]; then + su - www-data -s /bin/sh -c "$1" + else + sh -c "$1" + fi } installed_version="0.0.0.0" @@ -37,9 +37,9 @@ if version_greater "$image_version" "$installed_version"; then run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before fi if [ "$(id -u)" = 0 ]; then - rsync_options="-rlDog --chown www-data:root" + rsync_options="-rlDog --chown www-data:root" else - rsync_options="-rlD" + rsync_options="-rlD" fi rsync $rsync_options --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/ diff --git a/13.0/apache/entrypoint.sh b/13.0/apache/entrypoint.sh index 8f3ac087..2ad63ec4 100755 --- a/13.0/apache/entrypoint.sh +++ b/13.0/apache/entrypoint.sh @@ -3,7 +3,7 @@ set -eu # version_greater A B returns whether A > B version_greater() { - [ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 -k3,3 -k4,4 | head -n 1)" != "$1" ] + [ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 -k3,3 -k4,4 | head -n 1)" != "$1" ] } # return true if specified directory is empty @@ -12,11 +12,11 @@ directory_empty() { } run_as() { - if [ "$(id -u)" = 0 ]; then - su - www-data -s /bin/sh -c "$1" - else - sh -c "$1" - fi + if [ "$(id -u)" = 0 ]; then + su - www-data -s /bin/sh -c "$1" + else + sh -c "$1" + fi } installed_version="0.0.0.0" @@ -37,9 +37,9 @@ if version_greater "$image_version" "$installed_version"; then run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before fi if [ "$(id -u)" = 0 ]; then - rsync_options="-rlDog --chown www-data:root" + rsync_options="-rlDog --chown www-data:root" else - rsync_options="-rlD" + rsync_options="-rlD" fi rsync $rsync_options --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/ diff --git a/13.0/fpm-alpine/entrypoint.sh b/13.0/fpm-alpine/entrypoint.sh index 8f3ac087..2ad63ec4 100755 --- a/13.0/fpm-alpine/entrypoint.sh +++ b/13.0/fpm-alpine/entrypoint.sh @@ -3,7 +3,7 @@ set -eu # version_greater A B returns whether A > B version_greater() { - [ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 -k3,3 -k4,4 | head -n 1)" != "$1" ] + [ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 -k3,3 -k4,4 | head -n 1)" != "$1" ] } # return true if specified directory is empty @@ -12,11 +12,11 @@ directory_empty() { } run_as() { - if [ "$(id -u)" = 0 ]; then - su - www-data -s /bin/sh -c "$1" - else - sh -c "$1" - fi + if [ "$(id -u)" = 0 ]; then + su - www-data -s /bin/sh -c "$1" + else + sh -c "$1" + fi } installed_version="0.0.0.0" @@ -37,9 +37,9 @@ if version_greater "$image_version" "$installed_version"; then run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before fi if [ "$(id -u)" = 0 ]; then - rsync_options="-rlDog --chown www-data:root" + rsync_options="-rlDog --chown www-data:root" else - rsync_options="-rlD" + rsync_options="-rlD" fi rsync $rsync_options --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/ diff --git a/13.0/fpm/entrypoint.sh b/13.0/fpm/entrypoint.sh index 8f3ac087..2ad63ec4 100755 --- a/13.0/fpm/entrypoint.sh +++ b/13.0/fpm/entrypoint.sh @@ -3,7 +3,7 @@ set -eu # version_greater A B returns whether A > B version_greater() { - [ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 -k3,3 -k4,4 | head -n 1)" != "$1" ] + [ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 -k3,3 -k4,4 | head -n 1)" != "$1" ] } # return true if specified directory is empty @@ -12,11 +12,11 @@ directory_empty() { } run_as() { - if [ "$(id -u)" = 0 ]; then - su - www-data -s /bin/sh -c "$1" - else - sh -c "$1" - fi + if [ "$(id -u)" = 0 ]; then + su - www-data -s /bin/sh -c "$1" + else + sh -c "$1" + fi } installed_version="0.0.0.0" @@ -37,9 +37,9 @@ if version_greater "$image_version" "$installed_version"; then run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before fi if [ "$(id -u)" = 0 ]; then - rsync_options="-rlDog --chown www-data:root" + rsync_options="-rlDog --chown www-data:root" else - rsync_options="-rlD" + rsync_options="-rlD" fi rsync $rsync_options --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/ diff --git a/14.0-beta/apache/entrypoint.sh b/14.0-beta/apache/entrypoint.sh index 8f3ac087..2ad63ec4 100755 --- a/14.0-beta/apache/entrypoint.sh +++ b/14.0-beta/apache/entrypoint.sh @@ -3,7 +3,7 @@ set -eu # version_greater A B returns whether A > B version_greater() { - [ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 -k3,3 -k4,4 | head -n 1)" != "$1" ] + [ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 -k3,3 -k4,4 | head -n 1)" != "$1" ] } # return true if specified directory is empty @@ -12,11 +12,11 @@ directory_empty() { } run_as() { - if [ "$(id -u)" = 0 ]; then - su - www-data -s /bin/sh -c "$1" - else - sh -c "$1" - fi + if [ "$(id -u)" = 0 ]; then + su - www-data -s /bin/sh -c "$1" + else + sh -c "$1" + fi } installed_version="0.0.0.0" @@ -37,9 +37,9 @@ if version_greater "$image_version" "$installed_version"; then run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before fi if [ "$(id -u)" = 0 ]; then - rsync_options="-rlDog --chown www-data:root" + rsync_options="-rlDog --chown www-data:root" else - rsync_options="-rlD" + rsync_options="-rlD" fi rsync $rsync_options --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/ diff --git a/14.0-beta/fpm-alpine/entrypoint.sh b/14.0-beta/fpm-alpine/entrypoint.sh index 8f3ac087..2ad63ec4 100755 --- a/14.0-beta/fpm-alpine/entrypoint.sh +++ b/14.0-beta/fpm-alpine/entrypoint.sh @@ -3,7 +3,7 @@ set -eu # version_greater A B returns whether A > B version_greater() { - [ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 -k3,3 -k4,4 | head -n 1)" != "$1" ] + [ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 -k3,3 -k4,4 | head -n 1)" != "$1" ] } # return true if specified directory is empty @@ -12,11 +12,11 @@ directory_empty() { } run_as() { - if [ "$(id -u)" = 0 ]; then - su - www-data -s /bin/sh -c "$1" - else - sh -c "$1" - fi + if [ "$(id -u)" = 0 ]; then + su - www-data -s /bin/sh -c "$1" + else + sh -c "$1" + fi } installed_version="0.0.0.0" @@ -37,9 +37,9 @@ if version_greater "$image_version" "$installed_version"; then run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before fi if [ "$(id -u)" = 0 ]; then - rsync_options="-rlDog --chown www-data:root" + rsync_options="-rlDog --chown www-data:root" else - rsync_options="-rlD" + rsync_options="-rlD" fi rsync $rsync_options --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/ diff --git a/14.0-beta/fpm/entrypoint.sh b/14.0-beta/fpm/entrypoint.sh index 8f3ac087..2ad63ec4 100755 --- a/14.0-beta/fpm/entrypoint.sh +++ b/14.0-beta/fpm/entrypoint.sh @@ -3,7 +3,7 @@ set -eu # version_greater A B returns whether A > B version_greater() { - [ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 -k3,3 -k4,4 | head -n 1)" != "$1" ] + [ "$(printf '%s\n' "$@" | sort -t '.' -n -k1,1 -k2,2 -k3,3 -k4,4 | head -n 1)" != "$1" ] } # return true if specified directory is empty @@ -12,11 +12,11 @@ directory_empty() { } run_as() { - if [ "$(id -u)" = 0 ]; then - su - www-data -s /bin/sh -c "$1" - else - sh -c "$1" - fi + if [ "$(id -u)" = 0 ]; then + su - www-data -s /bin/sh -c "$1" + else + sh -c "$1" + fi } installed_version="0.0.0.0" @@ -37,9 +37,9 @@ if version_greater "$image_version" "$installed_version"; then run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before fi if [ "$(id -u)" = 0 ]; then - rsync_options="-rlDog --chown www-data:root" + rsync_options="-rlDog --chown www-data:root" else - rsync_options="-rlD" + rsync_options="-rlD" fi rsync $rsync_options --delete --exclude /config/ --exclude /data/ --exclude /custom_apps/ --exclude /themes/ /usr/src/nextcloud/ /var/www/html/